libcap: add CPPFLAGS

Forward the OpenWrt CPPFLAGS to the compile process. This fixes fortify
sources support.

Allow to extend the CPPFLAGS and not only overwrite.

Link: https://github.com/openwrt/openwrt/pull/22056
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/libs/libcap/Makefile b/package/libs/libcap/Makefile
index 989209302a489be6be15fbc6d457d00bd2c2905b..1f800867bcf791957f3c0ce1859efb2a5b475efc 100644 (file)
--- a/package/libs/libcap/Makefile
+++ b/package/libs/libcap/Makefile
@@ -66,6 +66,7 @@ MAKE_FLAGS += \
     BUILD_CC="$(CC)" \
     BUILD_CFLAGS="$(FPIC) -I$(PKG_BUILD_DIR)/libcap/include" \
     CFLAGS="$(TARGET_CFLAGS)" \
+    TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
     LD="$(TARGET_CC) -Wl,-x -shared" \
     LDFLAGS="$(TARGET_LDFLAGS)" \
     INDENT="| true" \

diff --git a/package/libs/libcap/patches/002-fix-CPPFLAGS.patch b/package/libs/libcap/patches/002-fix-CPPFLAGS.patch
new file mode 100644 (file)
index 0000000..e8bf42b
--- /dev/null
+++ b/package/libs/libcap/patches/002-fix-CPPFLAGS.patch
@@ -0,0 +1,15 @@
+Add variable to extend the CPPFLAGS. When specifying CPPFLAGS, it will 
+replace CPPFLAGS. When giving TARGET_CPPFLAGS it is added to the 
+CPPFLAGS.
+
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -83,7 +83,7 @@ WARNINGS=-Wall -Wwrite-strings -Wpointer
+ COPTS ?= -O2
+ CFLAGS ?= $(COPTS) $(DEBUG)
+ CFLAGS += $(WARNINGS)
+-CPPFLAGS += -Dlinux $(DEFINES) $(LIBCAP_INCLUDES)
++CPPFLAGS += $(TARGET_CPPFLAGS) -Dlinux $(DEFINES) $(LIBCAP_INCLUDES)
+ LDFLAGS ?= # -g
+ 
+ BUILD_CC ?= $(CC)