From cceddfd9d75ba9dffb7e6c7a5c866e36eef36add Mon Sep 17 00:00:00 2001 From: "Eric N. Vander Weele" Date: Thu, 18 Feb 2016 13:20:04 -0800 Subject: [PATCH 1/1] sys-apps/net-tools: Add '-lint' when USE='nls' for bug 575102 Signed-off-by: Eric N. Vander Weele --- .../net-tools-1.60_p20151124144947-lintl.patch | 71 ++++++++++++++++++++++ .../net-tools-1.60_p20151124144947.ebuild | 4 ++ 2 files changed, 75 insertions(+) create mode 100644 sys-apps/net-tools/files/net-tools-1.60_p20151124144947-lintl.patch diff --git a/sys-apps/net-tools/files/net-tools-1.60_p20151124144947-lintl.patch b/sys-apps/net-tools/files/net-tools-1.60_p20151124144947-lintl.patch new file mode 100644 index 0000000..839c4ac --- /dev/null +++ b/sys-apps/net-tools/files/net-tools-1.60_p20151124144947-lintl.patch @@ -0,0 +1,71 @@ +https://bugs.gentoo.org/show_bug.cgi?id=575102 + +--- a/Makefile ++++ b/Makefile +@@ -67,6 +67,10 @@ ifeq ($(HAVE_AFDECnet),1) + DNLIB = -ldnet + endif + ++ifeq ($(I18N),1) ++LIBS += -lintl ++endif ++ + ifeq ($(origin CC), undefined) + CC = gcc + endif +@@ -170,40 +174,40 @@ subdirs: libdir + @for i in $(SUBDIRS:$(NET_LIB_PATH)/=); do $(MAKE) -C $$i || exit $$? ; done + + ifconfig: $(NET_LIB) ifconfig.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ ifconfig.o $(NLIB) + + nameif: $(NET_LIB) nameif.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ nameif.o $(NLIB) + + hostname: hostname.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ hostname.o $(DNLIB) + + route: $(NET_LIB) route.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ route.o $(NLIB) + + arp: $(NET_LIB) arp.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ arp.o $(NLIB) + + rarp: $(NET_LIB) rarp.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ rarp.o $(NLIB) + + slattach: $(NET_LIB) slattach.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ slattach.o $(NLIB) + + plipconfig: $(NET_LIB) plipconfig.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ plipconfig.o $(NLIB) + + netstat: $(NET_LIB) netstat.o statistics.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(NLIB) $(SELIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ netstat.o statistics.o $(NLIB) $(SELIB) + + iptunnel: $(NET_LIB) iptunnel.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ iptunnel.o $(NLIB) + + ipmaddr: $(NET_LIB) ipmaddr.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ ipmaddr.o $(NLIB) + + mii-tool: $(NET_LIB) mii-tool.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ mii-tool.o $(NLIB) + + installbin: + @echo +-- +2.7.1 + diff --git a/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild b/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild index 5db331c..8664988 100644 --- a/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild +++ b/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild @@ -60,6 +60,10 @@ set_opt() { config.in || die } +src_prepare() { + epatch "${FILESDIR}/${P}-lintl.patch" +} + src_configure() { set_opt I18N use nls set_opt HAVE_AFINET6 use ipv6 -- 2.7.1