summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2008-02-27 09:36:13 +0000
committerAlistair Bush <ali_bush@gentoo.org>2008-02-27 09:36:13 +0000
commita7398b72db4ed080bbae8e2d56d007b8555de993 (patch)
tree227b60c6b90de2ee9b12ca14bcd55cddfafcb988 /dev-java
parentstable x86, security bug 209410 (diff)
downloadgentoo-2-a7398b72db4ed080bbae8e2d56d007b8555de993.tar.gz
gentoo-2-a7398b72db4ed080bbae8e2d56d007b8555de993.tar.bz2
gentoo-2-a7398b72db4ed080bbae8e2d56d007b8555de993.zip
Fixed build issues on x86.
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/java-service-wrapper/ChangeLog6
-rw-r--r--dev-java/java-service-wrapper/java-service-wrapper-3.2.3.ebuild5
2 files changed, 8 insertions, 3 deletions
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/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)
}