From d1b5a6d68f2a17b73f5136d365bd1742a2dcac66 Mon Sep 17 00:00:00 2001 From: Liangbin Lian Date: Tue, 10 Jun 2025 11:03:13 +0800 Subject: [PATCH] zerotier: fix system include path `-isystem ext` makes `#include ` actually include `ext/miniupnpc/miniupnpc.h`. we should use `$(STAGING_DIR)/usr/include` as a higher priority system include path. Fix https://github.com/openwrt/openwrt/issues/18019 Signed-off-by: Liangbin Lian --- net/zerotier/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index bc19eaa7c2..41975d505c 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier PKG_VERSION:=1.14.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? @@ -62,6 +62,9 @@ endef TARGET_CFLAGS += -Wl,-z,noexecstack TARGET_LDFLAGS += -Wl,--as-needed -Wl,-z,noexecstack +# Prevent `-isystem ext` from causing the wrong miniupnpc header to be used (OpenWrt packages issue - 18019) +TARGET_CFLAGS += -isystem $(STAGING_DIR)/usr/include + define Package/zerotier/conffiles /etc/config/zerotier endef -- 2.30.2