From: Alistair Bush <ali_bush@gentoo.org>
Date: Wed, 27 Feb 2008 09:36:13 +0000 (+0000)
Subject: Fixed build issues on x86.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=291097c21fbce70791aaf07d6a520b56c3ed53c2;p=gentoo.git

Fixed build issues on x86.
Package-Manager: portage-2.1.4.4
---

diff --git a/dev-java/java-service-wrapper/ChangeLog b/dev-java/java-service-wrapper/ChangeLog
index 16386bf7da5c..8ed6f28c3411 100644
--- a/dev-java/java-service-wrapper/ChangeLog
+++ b/dev-java/java-service-wrapper/ChangeLog
@@ -1,6 +1,10 @@
 # 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.1 2008/02/25 05:28:42 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.2 2008/02/27 09:36:13 ali_bush Exp $
+
+  27 Feb 2008; Alistair Bush <ali_bush@gentoo.org>
+  java-service-wrapper-3.2.3.ebuild:
+  Fixed build issues on x86 thanks to Tommy[D] <tommy100@gmx.de>.
 
 *java-service-wrapper-3.2.3 (25 Feb 2008)
 
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index ebd378d58028..6dfa10416077 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX java-service-wrapper-3.2.3-build.xml.patch 2150 RMD160 00633e650d5a523f4ee92fb7908afa35e0d81b45 SHA1 f34c0ccd01aedc42aca381101420d8fc433ea86b SHA256 0a24d546abcf7d87cf766bb4a4b35fbf5e66a35be8e625f9e45f82aba78763bd
 DIST wrapper_3.2.3_src.tar.gz 3409483 RMD160 6638c8a1aef81f6b9c7dea006d185f08709c738d SHA1 92b5e7efab1f3341cd47170cba1d4d8b1ba3c766 SHA256 7e57b0103959fe3566def64b1dd3fef6537032a7e4b2a7811594f1db7d9f5859
-EBUILD java-service-wrapper-3.2.3.ebuild 1796 RMD160 9f42c2d979543a1be4a434832042278a2f3cf31e SHA1 eff8d7ca506f485d0960077946dfdb30df8448ca SHA256 7b93064f90f5ac8136a084cceb0c23066d1e379883c35e90fea766cab66216ea
-MISC ChangeLog 524 RMD160 a80e9e093071caf26f56bf37ca033e45b7d9d9ec SHA1 2159bb4a587d6563ea6de0244964c661b8241da8 SHA256 4bdcab35f2af1da68bea68d3e675f3d14c8f1c0585370aaf0de6967aa1ad7572
+EBUILD java-service-wrapper-3.2.3.ebuild 1809 RMD160 276e290a8881e19ce0e7a076905d79f5d1c37561 SHA1 ddcfcc81b06f3a6c2c3c68e10200af8c89f1a288 SHA256 4b90ce51611acebac20b39f1bceb45eb44f26d78582ed01f428fe36f5a79a18a
+MISC ChangeLog 679 RMD160 c47716b30f2357ca0703631b0d66ff6bc36c1e8c SHA1 85c45accc97c2fdb3fa1a326c7dd1db1c42d7219 SHA256 f2db4d29bf99886c47dbeafc05d1855f2ce85048303d901a38f4bb576d9df80a
 MISC metadata.xml 678 RMD160 7e5baa9bf71b0ae917d38506aa43ac224ea71f67 SHA1 d6e69438e3ca142e53b7ed78e13c3d59eb797df9 SHA256 66efe3088c28882763a88af92caac086fa1ebfbde847433080861b54592d7a07
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild
index f8cd541f5440..f3d8a9e1c697 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.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.2.3.ebuild,v 1.2 2008/02/25 06:15:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild,v 1.3 2008/02/27 09:36:13 ali_bush Exp $
 
 WANT_ANT_TASKS="ant-nodeps"
 JAVA_PKG_IUSE="doc source test"
@@ -42,7 +42,7 @@ src_unpack() {
 	# TODO file upstream
 	epatch "${FILESDIR}/${P}-build.xml.patch"
 
-	use x86 && sed -i -e 's|gcc -O3 -Wall --pedantic|$(CC) $(CFLAGS) -fPIC|g' \
+	use x86 && sed -i -e 's|gcc -O3 -Wall --pedantic|$(CC) $(CFLAGS) -fPIC -lm|g' \
 		"src/c/Makefile-linux-x86-${BITS}"
 	use amd64 && sed -i -e 's|gcc -O3 -fPIC -Wall --pedantic|$(CC) $(CFLAGS) -fPIC|g' \
 		"src/c/Makefile-linux-x86-${BITS}"
@@ -57,6 +57,7 @@ src_unpack() {
 }
 
 src_compile() {
+	tc-getCC
 	eant -Dbits=${BITS} jar compile-c $(use_doc -Djdoc.dir=api jdoc)
 }