diff options
author | Johann Schmitz <ercpe@gentoo.org> | 2014-11-13 15:11:53 +0000 |
---|---|---|
committer | Johann Schmitz <ercpe@gentoo.org> | 2014-11-13 15:11:53 +0000 |
commit | cbcbaf89f83009cf18c77f5844e8468d4b8721a4 (patch) | |
tree | 7d7fbe33be0665bd57a17fc95ae81f53d054fe1e /dev-java | |
parent | Fixed boot.properties generation (diff) | |
download | gentoo-2-cbcbaf89f83009cf18c77f5844e8468d4b8721a4.tar.gz gentoo-2-cbcbaf89f83009cf18c77f5844e8468d4b8721a4.tar.bz2 gentoo-2-cbcbaf89f83009cf18c77f5844e8468d4b8721a4.zip |
Added patch to strip -Werror from compile flags (bug #528780)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/jnr-ffi/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch | 18 | ||||
-rw-r--r-- | dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild | 65 |
3 files changed, 90 insertions, 1 deletions
diff --git a/dev-java/jnr-ffi/ChangeLog b/dev-java/jnr-ffi/ChangeLog index 83b885eb4fa6..c9088d24dbc6 100644 --- a/dev-java/jnr-ffi/ChangeLog +++ b/dev-java/jnr-ffi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/jnr-ffi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.13 2014/01/12 03:10:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.14 2014/11/13 15:11:53 ercpe Exp $ + +*jnr-ffi-0.7.11-r1 (13 Nov 2014) + + 13 Nov 2014; Johann Schmitz <ercpe@gentoo.org> + +files/jnr-ffi-0.7.11-flags.patch, +jnr-ffi-0.7.11-r1.ebuild: + Added patch to strip -Werror from compile flags (bug #528780) *jnr-ffi-1.0.10 (12 Jan 2014) diff --git a/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch b/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch new file mode 100644 index 000000000000..f47e8d259b15 --- /dev/null +++ b/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch @@ -0,0 +1,18 @@ +diff --git a/jnr-ffi-0.7.11/libtest/GNUmakefile b/jnr-ffi-0.7.11/libtest/GNUmakefile +index 1906219..c9a9c11 100644 +--- a/jnr-ffi-0.7.11/libtest/GNUmakefile ++++ b/jnr-ffi-0.7.11/libtest/GNUmakefile +@@ -37,10 +37,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS)) + # Compiler/linker flags from: + # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html + JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing +-OFLAGS = -O2 $(JFLAGS) +-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses ++OFLAGS = $(JFLAGS) ++WFLAGS = -W -Wall -Wno-unused -Wno-parentheses + PICFLAGS = -fPIC +-SOFLAGS = -shared -Wl,-O1 ++SOFLAGS = -shared + LDFLAGS += $(SOFLAGS) + + IFLAGS = -I"$(BUILD_DIR)" diff --git a/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild new file mode 100644 index 000000000000..32c85f0612e8 --- /dev/null +++ b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild,v 1.1 2014/11/13 15:11:53 ercpe Exp $ + +EAPI="5" + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 vcs-snapshot + +DESCRIPTION="An abstracted interface to invoking native functions from java" +HOMEPAGE="https://github.com/jnr/jnr-ffi" +SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="|| ( Apache-2.0 LGPL-3 )" +SLOT="0.7" +KEYWORDS="~amd64 ~x86" + +COMMON_DEP=" + >=dev-java/jffi-1.2.7-r1:1.2 + dev-java/jnr-x86asm:1.0 + dev-java/asm:4" + +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.5" + +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.5 + test? ( + dev-java/ant-junit:0 + >=dev-java/junit-4.8:4 + )" + +java_prepare() { + cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die + epatch "${FILESDIR}"/${P}-flags.patch +} + +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc" +JAVA_ANT_ENCODING="UTF-8" + +EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0" +EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" + +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" + +src_test() { + # Fails, upstream pom has ignore test failures enabled. + rm -v src/test/java/jnr/ffi/StringArrayTest.java || die + + # build native test library + emake BUILD_DIR=build -f libtest/GNUmakefile + +# _JAVA_OPTIONS="-Djffi.boot.library.path=${EPREFIX}/usr/$(get_libdir)/jffi-1.2 -Djffi.boot.library.path=${EPREFIX}/usr/$(get_libdir)/jffi -Djava.library.path=${EPREFIX}/usr/$(get_libdir)/jffi" + _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \ + java-pkg-2_src_test +} + +src_install() { + java-pkg_dojar target/${PN}.jar + + use doc && java-pkg_dojavadoc target/site/apidocs + use source && java-pkg_dosrc src/main/java/* +} |