summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-08-31 15:01:48 +0000
committerPacho Ramos <pacho@gentoo.org>2013-08-31 15:01:48 +0000
commit86357ee4383a0826a123e3ec66346933f6226362 (patch)
tree6d5f03429d86f5977974385c9129e5ad5ade6fc1 /dev-java/jffi
parentUnmask old xdm version that has been replaced already. (diff)
downloadgentoo-2-86357ee4383a0826a123e3ec66346933f6226362.tar.gz
gentoo-2-86357ee4383a0826a123e3ec66346933f6226362.tar.bz2
gentoo-2-86357ee4383a0826a123e3ec66346933f6226362.zip
Drop -Werror usage in tests and fix tests building with gcc-4.7 (#438130)
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-java/jffi')
-rw-r--r--dev-java/jffi/ChangeLog6
-rw-r--r--dev-java/jffi/jffi-1.0.11.ebuild7
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 7033db9068ef..f181f47ac742 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jffi
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.26 2013/02/07 13:15:36 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.27 2013/08/31 15:01:48 pacho Exp $
+
+ 31 Aug 2013; Pacho Ramos <pacho@gentoo.org> jffi-1.0.11.ebuild:
+ Drop -Werror usage in tests and fix tests building with gcc-4.7 (#438130)
*jffi-1.2.6 (07 Feb 2013)
@@ -134,4 +137,3 @@
22 May 2009; Vlastimil Babka <caster@gentoo.org> +jffi-0.3-r2.ebuild,
+metadata.xml:
New package, jruby dependency. Ebuild provided by chewi in java-overlay.
-
diff --git a/dev-java/jffi/jffi-1.0.11.ebuild b/dev-java/jffi/jffi-1.0.11.ebuild
index 532c6d5551cf..3e8b938ce256 100644
--- a/dev-java/jffi/jffi-1.0.11.ebuild
+++ b/dev-java/jffi/jffi-1.0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.11.ebuild,v 1.5 2012/08/25 19:09:47 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.11.ebuild,v 1.6 2013/08/31 15:01:48 pacho Exp $
EAPI="4"
@@ -37,11 +37,12 @@ src_unpack() {
java_prepare() {
cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
epatch "${FILESDIR}"/${P}_no-werror.patch
+ sed -i -e 's/-Werror //' libtest/GNUmakefile || die
find "${WORKDIR}" -iname '*.jar' -delete
# Fix build with GCC 4.7 #421501
- sed -i -e "s|-mimpure-text||g" jni/GNUmakefile || die
+ sed -i -e "s|-mimpure-text||g" jni/GNUmakefile libtest/GNUmakefile || die
}
JAVA_ANT_REWRITE_CLASSPATH="yes"