[patch] Remove -lnet, read my LIBS properly, put LDFLAGS before all objects and libs

procmail-3.22-r10-libnet.patch (text/plain), 1.12 KB, created by Jeroen Roovers (RETIRED) on 2011-05-23 00:30:29 UTC

Index: procmail-3.22-r10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r10.ebuild,v
retrieving revision 1.11
diff -u -B -r1.11 procmail-3.22-r10.ebuild
--- procmail-3.22-r10.ebuild	16 Mar 2011 10:34:58 -0000	1.11
+++ procmail-3.22-r10.ebuild	23 May 2011 00:28:47 -0000
@@ -50,6 +50,9 @@
 
 	# Fix for bug #270551
 	epatch "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
+
+	# Do not link to net-libs/libnet
+	sed -i Makefile -e 's| -lnet||g' || die
 }
 
 src_compile() {
@@ -58,11 +61,17 @@
 	append-flags -fno-inline-functions
 
 	sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
-		-e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \
+		-e '/^LDFLAGS\t=/s:).*:):g' \
 		-e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
 		-e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
 		-i Makefile || die "sed failed"
 
+	sed -e 's:$(LDFLAGS):$(LIBS):g' \
+		-e 's: -Wl,-z,now::g' \
+		-e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS} -Wl,-z,now:" \
+		-e '/ -o /s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		-i src/Makefile.0 || die "src/Makefile"
+
 	emake CC="$(tc-getCC)" || die
 }