diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2012-05-13 09:41:50 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2012-05-13 09:41:50 +0000 |
commit | 7e3f1a67b91eaf25d955e591fdbde01e5fde5389 (patch) | |
tree | db27307161ac37ce720921deda9d7a5341a1284e /dev-java/jna | |
parent | Version bump (diff) | |
download | gentoo-2-7e3f1a67b91eaf25d955e591fdbde01e5fde5389.tar.gz gentoo-2-7e3f1a67b91eaf25d955e591fdbde01e5fde5389.tar.bz2 gentoo-2-7e3f1a67b91eaf25d955e591fdbde01e5fde5389.zip |
Respect CC. #413277
Register optional dependency emul-linux-x86-jna for use with 32bit JVMs. #313209
Cleanup.
(Portage version: 2.1.10.58/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jna')
-rw-r--r-- | dev-java/jna/ChangeLog | 11 | ||||
-rw-r--r-- | dev-java/jna/files/jna-3.4.0-makefile-flags.patch | 62 | ||||
-rw-r--r-- | dev-java/jna/jna-3.4.0-r1.ebuild | 92 |
3 files changed, 164 insertions, 1 deletions
diff --git a/dev-java/jna/ChangeLog b/dev-java/jna/ChangeLog index 55773b4491ac..3b608df9bfb5 100644 --- a/dev-java/jna/ChangeLog +++ b/dev-java/jna/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-java/jna # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.17 2012/05/07 06:26:01 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.18 2012/05/13 09:41:50 sera Exp $ + +*jna-3.4.0-r1 (13 May 2012) + + 13 May 2012; Ralph Sennhauser <sera@gentoo.org> +jna-3.4.0-r1.ebuild, + +files/jna-3.4.0-makefile-flags.patch: + Respect CC. #413277 + Register optional dependency emul-linux-x86-jna for use with 32bit JVMs. + #313209 + Cleanup. 07 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> jna-3.4.0.ebuild: x86 stable wrt bug #413157 diff --git a/dev-java/jna/files/jna-3.4.0-makefile-flags.patch b/dev-java/jna/files/jna-3.4.0-makefile-flags.patch new file mode 100644 index 000000000000..e4ff00bf69da --- /dev/null +++ b/dev-java/jna/files/jna-3.4.0-makefile-flags.patch @@ -0,0 +1,62 @@ +diff --git a/native/Makefile b/native/Makefile +index 75246a8..a1c3e66 100644 +--- a/native/Makefile ++++ b/native/Makefile +@@ -70,7 +70,7 @@ LIBPFX=lib + LIBSFX=.so + ARSFX=.a + JNISFX=$(LIBSFX) +-CC=gcc ++CC?=gcc + LD=$(CC) + LIBS= + # Default to Sun recommendations for JNI compilation +@@ -83,10 +83,10 @@ CFLAGS_EXTRA= + COUT=-o $@ + CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include + CDEFINES=-D_REENTRANT +-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses +-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ ++PCFLAGS=-Wall -Wno-unused -Wno-parentheses ++CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ + -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"' +-LDFLAGS=-o $@ -shared ++LDFLAGS+=-o $@ -shared + ifeq ($(DYNAMIC_LIBFFI),true) + CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) + LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) +@@ -149,7 +149,7 @@ ifneq ($(MINGW),) + CDEFINES=-DPSAPI_VERSION=1 + CC = $(MINGW) -m64 -mno-cygwin + LD = $(CC) +-LDFLAGS=-o $@ -shared ++LDFLAGS+=-o $@ -shared + LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt + FFI_CONFIG += --host=x86_64-pc-mingw32 + else +@@ -169,14 +169,14 @@ ifeq ($(OS),linux) + ARCH=$(shell uname -m | sed 's/i.86/i386/g') + PCFLAGS+=-fPIC + CDEFINES+=-DHAVE_PROTECTION +-LDFLAGS+=-Wl,-soname,$@ ++LDFLAGS+= -Wl,-soname,$(shell basename $@) + endif + + ifneq (,$(findstring bsd,$(OS))) + ARCH=$(shell uname -m | sed 's/i.86/i386/g') + PCFLAGS+=-fPIC + CINCLUDES+=-I/usr/X11R6/include +-LDFLAGS=-o $@ -shared ++LDFLAGS+= -o $@ -shared + CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT + endif + +@@ -239,7 +239,7 @@ endif + + PCFLAGS+=$(ISYSROOT) -x objective-c + CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT +-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ ++LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \ + -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \ + -current_version $(JNA_JNI_VERSION) \ + -mmacosx-version-min=10.3 \ diff --git a/dev-java/jna/jna-3.4.0-r1.ebuild b/dev-java/jna/jna-3.4.0-r1.ebuild new file mode 100644 index 000000000000..961da179e4a6 --- /dev/null +++ b/dev-java/jna/jna-3.4.0-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.4.0-r1.ebuild,v 1.1 2012/05/13 09:41:50 sera Exp $ + +EAPI="4" + +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 java-ant-2 toolchain-funcs vcs-snapshot + +DESCRIPTION="Java Native Access (JNA)" +HOMEPAGE="https://github.com/twall/jna#readme" +SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}-src.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="+awt +nio-buffers" +REQUIRED_USE="test? ( awt nio-buffers )" + +COMMON_DEP=" + virtual/libffi" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.6" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.6 + dev-java/ant-nodeps:0 + virtual/pkgconfig + test? ( + dev-java/ant-junit:0 + dev-java/ant-trax:0 + )" + +java_prepare() { + # delete bundled jars and copy of libffi + find -name "*.jar" -exec rm -v {} + || die + rm -r native/libffi || die + + epatch "${FILESDIR}/${PV}-build.xml.patch" + # respect CFLAGS, don't inhibit warnings, honour CC + epatch "${FILESDIR}/${P}-makefile-flags.patch" + tc-export CC + + # Build to same directory on 64-bit archs. + mkdir build || die + ln -snf build build-d64 || die + + if ! use awt ; then + sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die + fi + + if ! use nio-buffers ; then + sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die + fi +} + +EANT_BUILD_TARGET="jar contrib-jars" +EANT_ANT_TASKS="ant-nodeps" +EANT_EXTRA_ARGS="-Ddynlink.native=true" + +EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax" +src_test() { + local sysprops="" + + # crashes vm (segfault) + sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java || die + + # crashes vm, java 7 only (icedtea-7, oracle-jdk-bin-1.7) + sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java || die + + sysprops+=" -Djava.awt.headless=true" + sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount + + mkdir -p lib || die + java-pkg_jar-from --into lib --build-only junit + + # need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't + # survive the junit task. + _JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test +} + +src_install() { + java-pkg_dojar build/${PN}.jar + java-pkg_dojar contrib/platform/dist/platform.jar + java-pkg_doso build/native/libjnidispatch.so + + java-pkg_register-optional-dependency emul-linux-x86-jna #313209 + + use source && java-pkg_dosrc src/com + use doc && java-pkg_dojavadoc doc/javadoc +} |