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 libelf & libmnl 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 --- iproute2-4.16.0/bridge/Makefile +++ iproute2-4.16.0/bridge/Makefile @@ -2,6 +2,7 @@ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o include ../config.mk +include ../config.include all: bridge --- iproute2-4.16.0/config.include +++ iproute2-4.16.0/config.include @@ -0,0 +1,22 @@ +# 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 + +# Rules can only be declared after all variables in them are known. +%.o: %.c + $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< + +# vim: ft=make: --- iproute2-4.16.0/configure +++ iproute2-4.16.0/configure @@ -212,7 +212,7 @@ 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 @@ -257,8 +257,8 @@ 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 @@ -272,8 +272,8 @@ 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_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG + echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG else echo "no" fi @@ -286,8 +286,8 @@ 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 else echo "no" fi @@ -426,7 +426,3 @@ echo -n "libcap support: " check_cap - -echo >> $CONFIG -echo "%.o: %.c" >> $CONFIG -echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG --- iproute2-4.16.0/devlink/Makefile +++ iproute2-4.16.0/devlink/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include TARGETS := --- iproute2-4.16.0/genl/Makefile +++ iproute2-4.16.0/genl/Makefile @@ -2,6 +2,7 @@ GENLOBJ=genl.o include ../config.mk +include ../config.include SHARED_LIBS ?= y CFLAGS += -fno-strict-aliasing --- iproute2-4.16.0/ip/Makefile +++ iproute2-4.16.0/ip/Makefile @@ -15,6 +15,7 @@ RTMONOBJ=rtmon.o include ../config.mk +include ../config.include ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef --- iproute2-4.16.0/lib/Makefile +++ iproute2-4.16.0/lib/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include CFLAGS += -fPIC --- iproute2-4.16.0/misc/Makefile +++ iproute2-4.16.0/misc/Makefile @@ -5,6 +5,7 @@ TARGETS=ss nstat ifstat rtacct lnstat include ../config.mk +include ../config.include ifeq ($(HAVE_BERKELEY_DB),y) TARGETS += arpd --- iproute2-4.16.0/netem/Makefile +++ iproute2-4.16.0/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 --- iproute2-4.16.0/rdma/Makefile +++ iproute2-4.16.0/rdma/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include TARGETS := --- iproute2-4.16.0/tc/Makefile +++ iproute2-4.16.0/tc/Makefile @@ -4,6 +4,7 @@ emp_ematch.yacc.o emp_ematch.lex.o include ../config.mk +include ../config.include SHARED_LIBS ?= y --- iproute2-4.16.0/tipc/Makefile +++ iproute2-4.16.0/tipc/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 include ../config.mk +include ../config.include TARGETS :=