The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets a variable as well as modifying CFLAGS & LDLIBS. If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks are still in place. Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they are only passed when correctly needed. Prior Gentoo testcase for reproduction: USE=minimal ebuild ... compile. - Linking with libbsd, libelf, libmnl & libcap based only on presence. - Links based on libselinux based only on presence. Closes: https://bugs.gentoo.org/643722 Signed-off-by: Robin H. Johnson Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler Added libcap to v4.17.0 by Lars Wendler Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler Forward-ported from v6.8.0 to v7.2.0 by Patrick McLean Update 2023-09-05: Removed libbsd enforcement from config.include for bug #911727 by Holger Hoffstätte --- a/config.include +++ b/config.include @@ -0,0 +1,26 @@ +# We can only modify CFLAGS/LDLIBS after all the config options are known. +ifeq ($(IP_CONFIG_SETNS),y) + CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) +endif +ifeq ($(HAVE_ELF),y) + CFLAGS += $(HAVE_ELF_CFLAGS) + LDLIBS += $(HAVE_ELF_LDLIBS) +endif +ifeq ($(HAVE_SELINUX),y) + CFLAGS += $(HAVE_SELINUX_CFLAGS) + LDLIBS += $(HAVE_SELINUX_LDLIBS) +endif +ifeq ($(HAVE_MNL),y) + CFLAGS += $(HAVE_MNL_CFLAGS) + LDLIBS += $(HAVE_MNL_LDLIBS) +endif +ifeq ($(HAVE_CAP),y) + CFLAGS += $(HAVE_CAP_CFLAGS) + LDLIBS += $(HAVE_CAP_LDLIBS) +endif + +# Rules can only be declared after all variables in them are known. +%.o: %.c + $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $< + +# vim: ft=make: --- a/bridge/Makefile +++ b/bridge/Makefile @@ -2,6 +2,7 @@ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o vni.o include ../config.mk +include ../config.include all: bridge diff --git a/configure b/configure index ebc0d97a..a3da8853 100755 --- a/configure +++ b/configure @@ -154,7 +154,7 @@ EOF if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then echo "IP_CONFIG_SETNS:=y" >>$CONFIG echo "yes" - echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG + echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG else echo "no" fi @@ -221,8 +221,8 @@ check_elf() echo "HAVE_ELF:=y" >>$CONFIG echo "yes" - echo 'CFLAGS += -DHAVE_ELF' "$(${PKG_CONFIG} libelf --cflags)" >> $CONFIG - echo 'LDLIBS += ' "$(${PKG_CONFIG} libelf --libs)" >>$CONFIG + echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' "$(${PKG_CONFIG} libelf --cflags)" >> $CONFIG + echo 'HAVE_ELF_LDLIBS += ' "$(${PKG_CONFIG} libelf --libs)" >>$CONFIG else echo "no" fi @@ -346,8 +346,8 @@ check_selinux() echo "HAVE_SELINUX:=y" >>$CONFIG echo "yes" - echo 'LDLIBS +=' "$(${PKG_CONFIG} --libs libselinux)" >>$CONFIG - echo 'CFLAGS += -DHAVE_SELINUX' "$(${PKG_CONFIG} --cflags libselinux)" >>$CONFIG + echo 'HAVE_SELINUX_LDLIBS +=' "$(${PKG_CONFIG} --libs libselinux)" >>$CONFIG + echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' "$(${PKG_CONFIG} --cflags libselinux)" >>$CONFIG else echo "no" fi @@ -390,8 +390,8 @@ check_mnl() echo "HAVE_MNL:=y" >>$CONFIG echo "yes" - echo 'CFLAGS += -DHAVE_LIBMNL' "$(${PKG_CONFIG} libmnl --cflags)" >>$CONFIG - echo 'LDLIBS +=' "$(${PKG_CONFIG} libmnl --libs)" >> $CONFIG + echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' "$(${PKG_CONFIG} libmnl --cflags)" >>$CONFIG + echo 'HAVE_MNL_LDLIBS +=' "$(${PKG_CONFIG} libmnl --libs)" >> $CONFIG if have_mnl_attr_get_uint; then echo "CFLAGS += -DHAVE_MNL_ATTR_GET_UINT" >>$CONFIG @@ -436,8 +436,8 @@ EOF echo "no" else if ${PKG_CONFIG} libbsd --exists; then - echo 'CFLAGS += -DHAVE_LIBBSD' "$(${PKG_CONFIG} libbsd --cflags)" >>$CONFIG - echo 'LDLIBS +=' "$(${PKG_CONFIG} libbsd --libs)" >> $CONFIG + echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' "$(${PKG_CONFIG} libbsd --cflags)" >>$CONFIG + echo 'HAVE_LIBBSD_LDLIBS +=' "$(${PKG_CONFIG} libbsd --libs)" >> $CONFIG echo "no" else echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG @@ -453,8 +453,8 @@ check_cap() echo "HAVE_CAP:=y" >>$CONFIG echo "yes" - echo 'CFLAGS += -DHAVE_LIBCAP' "$(${PKG_CONFIG} libcap --cflags)" >>$CONFIG - echo 'LDLIBS +=' "$(${PKG_CONFIG} libcap --libs)" >> $CONFIG + echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' "$(${PKG_CONFIG} libcap --cflags)" >>$CONFIG + echo 'HAVE_CAP_LDLIBS +=' "$(${PKG_CONFIG} libcap --libs)" >> $CONFIG else echo "no" fi @@ -642,7 +642,3 @@ check_cap echo -n "color output: " check_color - -echo >> $CONFIG -echo "%.o: %.c" >> $CONFIG -echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG diff --git a/dcb/Makefile b/dcb/Makefile index 10794c9d..0e346985 100644 --- a/dcb/Makefile +++ b/dcb/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include DCBOBJ = dcb.o \ dcb_app.o \ diff --git a/devlink/Makefile b/devlink/Makefile index ec62f0c6..f050a415 100644 --- a/devlink/Makefile +++ b/devlink/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include DEVLINKOBJ = devlink.o TARGETS += devlink diff --git a/genl/Makefile b/genl/Makefile index 0bd27ff6..880d01a3 100644 --- a/genl/Makefile +++ b/genl/Makefile @@ -2,6 +2,7 @@ GENLOBJ=genl.o include ../config.mk +include ../config.include SHARED_LIBS ?= y CFLAGS += -fno-strict-aliasing diff --git a/ip/Makefile b/ip/Makefile index 3535ba78..72ef541e 100644 --- a/ip/Makefile +++ b/ip/Makefile @@ -18,6 +18,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ RTMONOBJ=rtmon.o include ../config.mk +include ../config.include ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=routel diff --git a/lib/Makefile b/lib/Makefile index 7035f40f..357c33f1 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include CFLAGS += -fPIC diff --git a/misc/Makefile b/misc/Makefile index 50dae79c..ab559a57 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -5,6 +5,7 @@ LNSTATOBJ=lnstat.o lnstat_util.o TARGETS=ss nstat ifstat rtacct lnstat include ../config.mk +include ../config.include ifeq ($(HAVE_BERKELEY_DB),y) TARGETS += arpd diff --git a/netem/Makefile b/netem/Makefile index ba4c5a76..e8899ee4 100644 --- a/netem/Makefile +++ b/netem/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include DISTGEN = maketable normal pareto paretonormal DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist diff --git a/rdma/Makefile b/rdma/Makefile index 66fe53f9..e59115d4 100644 --- a/rdma/Makefile +++ b/rdma/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB include ../config.mk +include ../config.include CFLAGS += -I./include/uapi/ diff --git a/tc/Makefile b/tc/Makefile index 6264a772..374a8a42 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -4,6 +4,7 @@ TCOBJ= tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o tc_monitor.o \ emp_ematch.tab.o emp_ematch.lex.o include ../config.mk +include ../config.include SHARED_LIBS ?= y diff --git a/tipc/Makefile b/tipc/Makefile index 4f0aba7e..9c08b854 100644 --- a/tipc/Makefile +++ b/tipc/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include TIPCOBJ=bearer.o \ cmdl.o link.o \ diff --git a/vdpa/Makefile b/vdpa/Makefile index 86f7221e..5a92f218 100644 --- a/vdpa/Makefile +++ b/vdpa/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include CFLAGS += -I./include/uapi/ VDPAOBJ = vdpa.o diff --git a/netshaper/Makefile b/netshaper/Makefile index 54a6a691..8dab7ec2 100644 --- a/netshaper/Makefile +++ b/netshaper/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include NSOBJ = netshaper.o TARGETS += netshaper diff --git a/dpll/Makefile b/dpll/Makefile index 3a37184b..40dfb87b 100644 --- a/dpll/Makefile +++ b/dpll/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include # iproute2 libraries LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a