From f4fc10428424904caf2035cffc442195cb088b2c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Jul 2021 10:27:13 +0100 Subject: gentoo resync : 28.07.2021 --- sys-apps/iproute2/Manifest | 1 - .../files/iproute2-5.11.0-configure-nomagic.patch | 235 --------------------- 2 files changed, 236 deletions(-) delete mode 100644 sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch (limited to 'sys-apps/iproute2') diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index b6de7c8c03f6..a5899b3cb0cf 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -2,7 +2,6 @@ AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864 AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9 AUX iproute2-5.10.0-configure-nomagic.patch 6511 BLAKE2B f7e75bf8db95c6af4798fbedd936ac7ce1d470c9cf5d31809fda9df8475ce2dafbca2b6d80ab1d2ced544ed1a3310d1db2898a3288e24356d691d08f633b14bd SHA512 025f60975f7579dae9dc9cf0410fa8cef4ee96f954133af17e9c4f8a860fba4c33086845a568f46e68f2a4f4088f84e57c200fd4b4bc417e6f3c48d7cf9e7bcb -AUX iproute2-5.11.0-configure-nomagic.patch 6701 BLAKE2B 8e4176b88adca58d5cc9f7a168a68718db3830173399375fb23b4e861b7a3684c731f61854dfa5647767e1af9dbbf30161240bed33ed8a47ea353119a4251d9e SHA512 1d51c66909c92ba4ca096bf53f067712a7740ab4e8d4c893dfb47b3bea52ded89995ff9f36cc0364a0a21e7486909e390f457ca62fef2b28b519d867b31ce971 AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3 DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 diff --git a/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch deleted file mode 100644 index 8ccd02a10e2f..000000000000 --- a/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch +++ /dev/null @@ -1,235 +0,0 @@ -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 - ---- iproute2-5.11.0/bridge/Makefile -+++ iproute2-5.11.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-5.11.0/config.include -+++ iproute2-5.11.0/config.include -@@ -0,0 +1,32 @@ -+# 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 -+ifeq ($(HAVE_LIBBSD),y) -+ CFLAGS += $(HAVE_LIBBSD_CFLAGS) -+ LDLIBS += $(HAVE_LIBBSD_LDLIBS) -+else -+ CFLAGS += -DNEED_STRLCPY -+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: ---- iproute2-5.11.0/configure -+++ iproute2-5.11.0/configure -@@ -195,7 +195,7 @@ - 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 -@@ -238,8 +238,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 -@@ -357,8 +357,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 -@@ -370,8 +370,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 -@@ -411,8 +411,8 @@ - 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 -@@ -428,8 +428,8 @@ - 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 -@@ -512,7 +512,3 @@ - - echo -n "libcap support: " - check_cap -- --echo >> $CONFIG --echo "%.o: %.c" >> $CONFIG --echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG ---- iproute2-5.11.0/dcb/Makefile -+++ iproute2-5.11.0/dcb/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - TARGETS := - ---- iproute2-5.11.0/devlink/Makefile -+++ iproute2-5.11.0/devlink/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - TARGETS := - ---- iproute2-5.11.0/genl/Makefile -+++ iproute2-5.11.0/genl/Makefile -@@ -2,6 +2,7 @@ - GENLOBJ=genl.o - - include ../config.mk -+include ../config.include - SHARED_LIBS ?= y - - CFLAGS += -fno-strict-aliasing ---- iproute2-5.11.0/ip/Makefile -+++ iproute2-5.11.0/ip/Makefile -@@ -16,6 +16,7 @@ - RTMONOBJ=rtmon.o - - include ../config.mk -+include ../config.include - - ALLOBJ=$(IPOBJ) $(RTMONOBJ) - SCRIPTS=ifcfg rtpr routel routef ---- iproute2-5.11.0/lib/Makefile -+++ iproute2-5.11.0/lib/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - CFLAGS += -fPIC - ---- iproute2-5.11.0/misc/Makefile -+++ iproute2-5.11.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-5.11.0/netem/Makefile -+++ iproute2-5.11.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-5.11.0/rdma/Makefile -+++ iproute2-5.11.0/rdma/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB - include ../config.mk -+include ../config.include - - TARGETS := - ---- iproute2-5.11.0/tc/Makefile -+++ iproute2-5.11.0/tc/Makefile -@@ -4,6 +4,7 @@ - emp_ematch.tab.o emp_ematch.lex.o - - include ../config.mk -+include ../config.include - - SHARED_LIBS ?= y - ---- iproute2-5.11.0/tipc/Makefile -+++ iproute2-5.11.0/tipc/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - include ../config.mk -+include ../config.include - - TARGETS := - -- cgit v1.2.3