Add fix for --as-needed reported in bug #247050. Thanks to Diego Pettenò <flameeyes@gentoo.org> for report and help.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 71 insertions, 10 deletions

diff --git a/dev-java/java-service-wrapper/ChangeLog b/dev-java/java-service-wrapper/ChangeLog
index 1c4c33178cb2..e050cfc72bc7 100644
--- a/dev-java/java-service-wrapper/ChangeLog
+++ b/dev-java/java-service-wrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/java-service-wrapper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.5 2008/09/07 07:35:33 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.6 2008/11/16 15:55:46 serkan Exp $
+
+  16 Nov 2008; Serkan Kaba <serkan@gentoo.org>
+  +files/java-service-wrapper-3.3.1-as-needed.patch,
+  java-service-wrapper-3.3.1.ebuild:
+  Add fix for --as-needed reported in bug #247050. Thanks to Diego Pettenò
+  <flameeyes@gentoo.org> for report and help.
 
   07 Sep 2008; Alistair Bush <ali_bush@gentoo.org>
   +java-service-wrapper-3.3.1.ebuild:
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
new file mode 100644
index 000000000000..c61679a602c1
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
@@ -0,0 +1,62 @@
+diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make
+--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make	2008-08-17 10:40:04.000000000 +0300
++++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make	2008-11-16 17:31:47.000000000 +0200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
++COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -lm -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make
+--- wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make	2008-08-17 10:40:04.000000000 +0300
++++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make	2008-11-16 17:31:54.000000000 +0200
+@@ -7,7 +7,7 @@
+ # license agreement you entered into with Tanuki Software.
+ # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
+ 
+-COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
++COMPILE = $(CC) -fPIC -DLINUX -D_FILE_OFFSET_BITS=64
+ 
+ INCLUDE=$(JAVA_HOME)/include
+ 
+@@ -33,14 +33,14 @@
+ 	if test ! -d .deps; then mkdir .deps; fi
+ 
+ wrapper: $(wrapper_SOURCE)
+-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+ 
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+-	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++	${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
+ 
+ %.o: %.c
+-	@echo '$(COMPILE) -c $<'; \
+-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
++	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+ 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+ 	tr ' ' '\012' < .deps/$(*F).pp \
+ 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
index 2b638b1bb61f..fe74cf46b660 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild,v 1.3 2008/09/07 07:35:33 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild,v 1.4 2008/11/16 15:55:46 serkan Exp $
 
 WANT_ANT_TASKS="ant-nodeps"
 JAVA_PKG_IUSE="doc source test"
@@ -37,14 +37,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-
-	# TODO file upstream
-
-	use x86 && sed -i -e 's|gcc -O3 -Wall --pedantic|$(CC) $(CFLAGS) -fPIC|g' \
-		"src/c/Makefile-linux-x86-${BITS}.make"
-	use amd64 && sed -i -e 's|gcc -O3 -fPIC -Wall --pedantic|$(CC) $(CFLAGS) -fPIC|g' \
-		"src/c/Makefile-linux-x86-${BITS}.make"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 }
 
 src_compile() {