Respect LDFLAGS wrt bug 335908. Thanks to Diego for the report.

Package-Manager: portage-2.2_rc77/cvs/Linux x86_64

4 files changed, 51 insertions, 53 deletions

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index 1fdbc1757cfd..e273472917c5 100644
--- a/sys-cluster/ipvsadm/ChangeLog
+++ b/sys-cluster/ipvsadm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/ipvsadm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.41 2010/08/17 21:36:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.42 2010/09/09 09:40:54 xarthisius Exp $
+
+*ipvsadm-1.25-r1 (09 Sep 2010)
+
+  09 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> -ipvsadm-1.25.ebuild,
+  +ipvsadm-1.25-r1.ebuild, -files/ipvsadm-1.25-build-fixup.diff,
+  +files/ipvsadm-1.25-r1-build-fixup.diff:
+  Respect LDFLAGS wrt bug 335908. Thanks to Diego for the report.
 
   17 Aug 2010; Sven Wegener <swegener@gentoo.org> ipvsadm-1.25.ebuild,
   +files/ipvsadm-1.25-netlink-conns.diff:
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index b0b49f092a5f..2660621d391a 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX ipvsadm-1.25-build-fixup.diff 2396 RMD160 e6a02b59140a19b301c6aa55d05ec67cedc5880f SHA1 4c45dbfd6eb597356db2d3bbda1ef157e336f47c SHA256 66c3d721e7a3e06e2d4d99121b372925e93e99078751a2be26c22d1ca3d0e9ec
 AUX ipvsadm-1.25-netlink-conns.diff 1376 RMD160 edea404fc5a00041674e0db5a0cd51a6ef862c51 SHA1 05b654d5ac3aab7a10cf1e356c18cace9e879d3a SHA256 65acd8e4b140c463b3382a4c3bfc47b5753fda5c975365450119f8daa193c70b
+AUX ipvsadm-1.25-r1-build-fixup.diff 2194 RMD160 5962baca01c882cb0b3a5e0a935ca1562806a6c7 SHA1 edcaed6ad01327b17ec94ccb78f256cdd6d1c3a6 SHA256 c68deb98bf859f0c8ae36a06f670ac0be1bc44f67d3fb88fe0e544f3e71432ce
 AUX ipvsadm-init 764 RMD160 447562aeb699ab12d97d088e97678c2ac98d7e5c SHA1 ce953d9013b3a5b0e35cc5901376d9bf54fd51f4 SHA256 296c44030f502882c361ff9ceff14fe1377150e9aae8dc6a9ddaa4bd94275868
 DIST ipvsadm-1.21-11.tar.gz 34030 RMD160 2476f127bfd76313a7e32d0f6d2d4225164ef872 SHA1 368630ac25a772221deb101ee86b87a5341a5bab SHA256 7b85020f84d4648166bce480d747d82ac5c9113f9a222e3de7eb92b7af0598fa
 DIST ipvsadm-1.24.tar.gz 32007 RMD160 6647adb3914e69bd2a6924b5a0f675b670cd57ed SHA1 6bb6ce422745d0fe6409d91df7820fd5e7d2eeeb SHA256 773cbada48061e3afafaeaa2800d5382b8ff638b2c929293c14a793112a0642a
 DIST ipvsadm-1.25.tar.gz 62248 RMD160 24f071a0ac431a47c8003d0af294f97f4dfdfbec SHA1 a23aadff85ccb55294ab2f4ca93a1869b8d22e2b SHA256 902c16a6458519fa5dd04457abe0c9edbd2ae4ae0334735634c6617c6eefeb69
 EBUILD ipvsadm-1.21-r1.ebuild 1310 RMD160 461f08a6f33382997ee8ddf26b5537976cceff2e SHA1 73989cbdb054ac572d94ceb23bba74f27e7c4c9b SHA256 96cc772326dea704906bee3539ab93a133e787f301e47d2139b48478e5d73270
 EBUILD ipvsadm-1.24.ebuild 1411 RMD160 ab671e93783095b8d400fefeb102465f743b3831 SHA1 20541c02cdba0abfebde323b2fc8db3eaa333771 SHA256 e177ea1cfdc0a875af659021698544412dac29bef4b7bce8235c9b277fc1d0b4
-EBUILD ipvsadm-1.25.ebuild 1593 RMD160 4f3f63b5fc0da5500581f7f434f172580463a429 SHA1 09062a097ce79fc7fe4b70afd64a89a46f5f5b9f SHA256 571283b4f3b581a1c58c97a1100a38a5557d036b7e99100884abe5d5caf99178
-MISC ChangeLog 5398 RMD160 e19ffc9dcb2d9d88db0782a5be32f4a1ea51173c SHA1 0d5e81febad8f9035e986c5bcc77e11054812a86 SHA256 a0659ad241f703ad93ead869c6f5418b286d78d470dd623af45c8f8690545af5
+EBUILD ipvsadm-1.25-r1.ebuild 1559 RMD160 b35488e128a6ad401427a1245829d23f9d93bd99 SHA1 979e735502e48c79379b8c26c913b73f4aff8aba SHA256 569ffeabc43c1fb3f7ef44d44245d891641264399010ff59622b6fd0440e386d
+MISC ChangeLog 5683 RMD160 55ae2011ac7372f677da966650b707d16d1deb06 SHA1 ed82ddb0d2ebd71c793c5d3614d6e2f13ca14101 SHA256 e98c9e744af3a0205bbb287ca7490185f4e7cbaa618094c83aa386ac2ccc9b96
 MISC metadata.xml 338 RMD160 6a0b3d8db242801ec28383227a30a6de1bd19f07 SHA1 cbb841da3f9ed920ea69d8942256e9905a506239 SHA256 548ca1b886f774b9099b26854a9d4fd5505a1e09a3d39634bfcc10692fe7fd22
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxrAMcACgkQI1lqEGTUzyQUNwCfaV2bfqp+LEAPp8ptcCmSLz7A
-CcsAoIbeafleFSdP5er9iB1RiMWHa0aH
-=eCXw
------END PGP SIGNATURE-----
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.25-build-fixup.diff b/sys-cluster/ipvsadm/files/ipvsadm-1.25-r1-build-fixup.diff
index dee72895c200..03bbf5f867eb 100644
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.25-build-fixup.diff
+++ b/sys-cluster/ipvsadm/files/ipvsadm-1.25-r1-build-fixup.diff
@@ -1,36 +1,5 @@
-diff -Nuar --exclude '*.spec' ipvsadm-1.25.orig/libipvs/Makefile ipvsadm-1.25/libipvs/Makefile
---- ipvsadm-1.25.orig/libipvs/Makefile	2008-09-21 10:02:03.000000000 +0000
-+++ ipvsadm-1.25/libipvs/Makefile	2009-10-10 17:28:48.000000000 +0000
-@@ -1,14 +1,14 @@
- # Makefile for libipvs
- 
- CC		= gcc
--CFLAGS		= -Wall -Wunused -Wstrict-prototypes -g -fPIC
-+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes -fPIC
- ifneq (0,$(HAVE_NL))
--CFLAGS		+= -DLIBIPVS_USE_NL
-+DEFINES += -DLIBIPVS_USE_NL
- endif
- 
- INCLUDE		+= $(shell if [ -f ../../ip_vs.h ]; then	\
- 		     echo "-I../../."; fi;)
--DEFINES		= $(shell if [ ! -f ../../ip_vs.h ]; then	\
-+DEFINES		+= $(shell if [ ! -f ../../ip_vs.h ]; then	\
- 		    echo "-DHAVE_NET_IP_VS_H"; fi;)
- 
- .PHONY		= all clean install dist distclean rpm rpms
-@@ -24,7 +24,7 @@
- 		$(CC) -shared -Wl,-soname,$@ -o $@ $^
- 
- %.o:		%.c
--		$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
-+		$(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
- 
- clean:
- 		rm -f *.[ao] *~ *.orig *.rej core *.so
-diff -Nuar --exclude '*.spec' ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile
---- ipvsadm-1.25.orig/Makefile	2008-09-23 16:14:46.000000000 +0000
-+++ ipvsadm-1.25/Makefile	2009-10-10 17:33:55.000000000 +0000
+--- ipvsadm-1.25/Makefile
++++ ipvsadm-1.25/Makefile
 @@ -45,11 +45,11 @@
  STATIC_LIBS	= libipvs/libipvs.a
  
@@ -57,7 +26,7 @@ diff -Nuar --exclude '*.spec' ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile
  
  ipvsadm:	$(OBJS) $(STATIC_LIBS)
 -		$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-+		$(CC) $(OPTFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
++		$(CC) $(LDFLAGS) $(OPTFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
  
  install:        all
  		if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
@@ -76,3 +45,36 @@ diff -Nuar --exclude '*.spec' ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile
  %.o:	%.c
 -		$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
 +		$(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
+--- ipvsadm-1.25/libipvs/Makefile
++++ ipvsadm-1.25/libipvs/Makefile
+@@ -1,14 +1,14 @@
+ # Makefile for libipvs
+ 
+ CC		= gcc
+-CFLAGS		= -Wall -Wunused -Wstrict-prototypes -g -fPIC
++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes -fPIC
+ ifneq (0,$(HAVE_NL))
+-CFLAGS		+= -DLIBIPVS_USE_NL
++DEFINES += -DLIBIPVS_USE_NL
+ endif
+ 
+ INCLUDE		+= $(shell if [ -f ../../ip_vs.h ]; then	\
+ 		     echo "-I../../."; fi;)
+-DEFINES		= $(shell if [ ! -f ../../ip_vs.h ]; then	\
++DEFINES		+= $(shell if [ ! -f ../../ip_vs.h ]; then	\
+ 		    echo "-DHAVE_NET_IP_VS_H"; fi;)
+ 
+ .PHONY		= all clean install dist distclean rpm rpms
+@@ -21,10 +21,10 @@
+ 		ar rv $@ $^
+ 
+ $(SHARED_LIB):	libipvs.o ip_vs_nl_policy.o
+-		$(CC) -shared -Wl,-soname,$@ -o $@ $^
++		$(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
+ 
+ %.o:		%.c
+-		$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
++		$(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
+ 
+ clean:
+ 		rm -f *.[ao] *~ *.orig *.rej core *.so
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.25-r1.ebuild
index 213b9afc65f9..fc185a91fd6e 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild,v 1.4 2010/08/17 21:36:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.25-r1.ebuild,v 1.1 2010/09/09 09:40:54 xarthisius Exp $
 
 EAPI=2
 inherit linux-info toolchain-funcs eutils
@@ -26,14 +26,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/ipvsadm-1.25-build-fixup.diff
-	epatch "${FILESDIR}"/ipvsadm-1.25-netlink-conns.diff
+	epatch "${FILESDIR}"/${PF}-build-fixup.diff \
+		"${FILESDIR}"/${P}-netlink-conns.diff
 }
 
 src_compile() {
-	emake \
+	emake -e \
 		INCLUDE="-I.. -I." \
-		CFLAGS="${CFLAGS}" \
 		CC="$(tc-getCC)" \
 		HAVE_NL=1 \
 		 || die "error compiling source"