* [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/
@ 2022-05-12 7:09 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2022-05-12 7:09 UTC (permalink / raw
To: gentoo-commits
commit: 0a265ada45d01cf883d55e3367472db981940aef
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed Apr 6 17:27:52 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu May 12 07:02:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a265ada
dev-java/jna: Use JUnit 4 to run tests for 5.10.0
The test classes excluded by 5.10.0-tests-exclude.patch actually have
some JUnit 4 tests, whereas the rest of the test suite contains JUnit 3
tests. JUnit 4 can be used to run both types of tests, but JUnit 3
cannot run JUnit 4 tests, which is why the patch was needed. By
switching to JUnit 4, test coverage increases, and the patch can also be
dropped.
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/jna/files/5.10.0-tests-exclude.patch | 27 ---------------------------
dev-java/jna/jna-5.10.0.ebuild | 3 +--
2 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch b/dev-java/jna/files/5.10.0-tests-exclude.patch
deleted file mode 100644
index e608e2087f44..000000000000
--- a/dev-java/jna/files/5.10.0-tests-exclude.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Thu, 6 Jan 2022 12:21:22 -0800
-Subject: [PATCH] Skip execution of test classes without any tests
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index ed104c2..9fb15ae 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1388,6 +1388,9 @@ cd ..
- <fileset dir="${test.src}" excludes="${tests.exclude-patterns}">
- <patternset includes="${tests.include}"/>
- <include name="${tests.platform}"/>
-+ <exclude name="com/sun/jna/DefaultMethodInvocationTest.java"/>
-+ <exclude name="com/sun/jna/ELFAnalyserTest.java"/>
-+ <exclude name="com/sun/jna/PrematureGCTest.java"/>
- <exclude name="${tests.exclude}"/>
- </fileset>
- </batchtest>
---
-2.34.1
-
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 80d0409f955c..1d15c940f056 100644
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -30,7 +30,7 @@ DEPEND="
dev-java/ant-core:0
dev-java/asm:9
test? (
- dev-java/ant-junit:0
+ dev-java/ant-junit4:0
dev-java/junit:4
dev-java/reflections:0
)
@@ -46,7 +46,6 @@ RDEPEND="
DOCS=( README.md CHANGES.md OTHERS TODO )
PATCHES=(
"${FILESDIR}/${PV}-build.xml.patch"
- "${FILESDIR}/${PV}-tests-exclude.patch"
"${FILESDIR}/4.2.2-makefile-flags.patch"
)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/
@ 2022-05-31 23:46 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-05-31 23:46 UTC (permalink / raw
To: gentoo-commits
commit: 14be4a0ea20880015e350f99b0f0140a10877736
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue May 31 14:20:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 31 23:44:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14be4a0e
dev-java/jna: do not call STRIP directly
Closes: https://bugs.gentoo.org/754999
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25702
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jna/files/5.11.0-makefile-flags.patch | 34 ++++++++++++++++++++++++++
dev-java/jna/jna-5.11.0.ebuild | 4 +--
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/dev-java/jna/files/5.11.0-makefile-flags.patch b/dev-java/jna/files/5.11.0-makefile-flags.patch
new file mode 100644
index 000000000000..4a84abebf45d
--- /dev/null
+++ b/dev-java/jna/files/5.11.0-makefile-flags.patch
@@ -0,0 +1,34 @@
+--- a/native/Makefile
++++ b/native/Makefile
+@@ -81,7 +81,7 @@ LIBPFX=lib
+ LIBSFX=.so
+ ARSFX=.a
+ JNISFX=$(LIBSFX)
+-CC=gcc
++CC?=gcc
+ LD=$(CC)
+ LIBS=
+ # Default to Sun recommendations for JNI compilation
+@@ -94,10 +94,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)
+@@ -108,7 +108,7 @@ endif
+ # Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking
+ # See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705
+ #LIBS=-L"$(LIBDIR)" -ljawt
+-STRIP=strip -x
++STRIP?=strip -x
+ # end defaults
+
+ # Android build (cross-compile) requires the android NDK.
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
index be8f367f117d..44173ced3c04 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.0.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
DOCS=( README.md CHANGES.md OTHERS TODO )
PATCHES=(
"${FILESDIR}/5.10.0-build.xml.patch"
- "${FILESDIR}/4.2.2-makefile-flags.patch"
+ "${FILESDIR}/5.11.0-makefile-flags.patch"
)
JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -65,7 +65,7 @@ pkg_setup() {
# Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS
# could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the
# variable's value, so define them in ANT_OPTS instead
- ANT_OPTS="-DCC='$(tc-getCC)'"
+ ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'"
# Parallel build does not respect dependency relationships between objects
ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/
@ 2022-01-08 8:57 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2022-01-08 8:57 UTC (permalink / raw
To: gentoo-commits
commit: 9eb362c301c9ca8a1968867436506860ac11a759
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Thu Jan 6 18:03:27 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jan 8 08:56:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb362c3
dev-java/jna: Add 5.10.0
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23679
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jna/Manifest | 1 +
dev-java/jna/files/5.10.0-build.xml.patch | 55 +++++++++++++++
dev-java/jna/files/5.10.0-tests-exclude.patch | 27 ++++++++
dev-java/jna/jna-5.10.0.ebuild | 99 +++++++++++++++++++++++++++
4 files changed, 182 insertions(+)
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 20ee000d50be..ac70c75ad8e2 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1 +1,2 @@
DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
+DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
diff --git a/dev-java/jna/files/5.10.0-build.xml.patch b/dev-java/jna/files/5.10.0-build.xml.patch
new file mode 100644
index 000000000000..242845bfd356
--- /dev/null
+++ b/dev-java/jna/files/5.10.0-build.xml.patch
@@ -0,0 +1,55 @@
+diff --git a/build.xml b/build.xml
+index ed104c2..cd8895c 100644
+--- a/build.xml
++++ b/build.xml
+@@ -182,9 +182,9 @@
+
+ <target name="-prepare-anttools">
+ <subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant>
+- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:$lib/asm-8.0.1.jar" />
+- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
+- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
++ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:${gentoo.classpath}" />
++ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:${gentoo.classpath}" />
++ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:${gentoo.classpath}" />
+ </target>
+
+ <target name="-dynamic-properties" depends="-prepare-anttools">
+@@ -385,7 +385,9 @@
+ <pathelement path="${build}/${jar}"/>
+ <pathelement path="${test.classes}"/>
+ <pathelement path="${build}/${testjar}"/>
++ <!--
+ <pathelement path="lib/clover.jar"/>
++ -->
+ <path refid="test.libs"/>
+ </path>
+ </target>
+@@ -1265,8 +1267,10 @@ cd ..
+ <mkdir dir="${build}/jws"/>
+ <copy todir="${build}/jws" file="${build}/${jar}"/>
+ <copy todir="${build}/jws" file="${build}/${testjar}"/>
++ <!--
+ <copy todir="${build}/jws" file="lib/junit.jar"/>
+ <copy todir="${build}/jws" file="lib/clover.jar"/>
++ -->
+ <jar jarfile="${build}/jws/jnidispatch.jar" createUnicodeExtraFields="never" encoding="UTF-8">
+ <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+ </jar>
+diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml
+index 47fa8ed..a623ce6 100644
+--- a/contrib/platform/build.xml
++++ b/contrib/platform/build.xml
+@@ -115,9 +115,9 @@
+
+ <target name="-prepare-anttools">
+ <subant antfile="build-ant-tools.xml" buildpath="${basedir}/../../"></subant>
+- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
++ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
++ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
++ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
+ </target>
+
+ <macrodef name="build-manifest">
diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch b/dev-java/jna/files/5.10.0-tests-exclude.patch
new file mode 100644
index 000000000000..e608e2087f44
--- /dev/null
+++ b/dev-java/jna/files/5.10.0-tests-exclude.patch
@@ -0,0 +1,27 @@
+From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Thu, 6 Jan 2022 12:21:22 -0800
+Subject: [PATCH] Skip execution of test classes without any tests
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index ed104c2..9fb15ae 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1388,6 +1388,9 @@ cd ..
+ <fileset dir="${test.src}" excludes="${tests.exclude-patterns}">
+ <patternset includes="${tests.include}"/>
+ <include name="${tests.platform}"/>
++ <exclude name="com/sun/jna/DefaultMethodInvocationTest.java"/>
++ <exclude name="com/sun/jna/ELFAnalyserTest.java"/>
++ <exclude name="com/sun/jna/PrematureGCTest.java"/>
+ <exclude name="${tests.exclude}"/>
+ </fileset>
+ </batchtest>
+--
+2.34.1
+
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
new file mode 100644
index 000000000000..b7730f9d8e7a
--- /dev/null
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.java.dev.jna:jna:5.10.0"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Java Native Access"
+HOMEPAGE="https://github.com/java-native-access/jna"
+SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+
+CDEPEND="
+ >=dev-libs/libffi-3.4:=
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ dev-java/animal-sniffer-annotations:0
+ dev-java/ant-core:0
+ dev-java/asm:9
+ test? (
+ dev-java/ant-junit:0
+ dev-java/junit:4
+ dev-java/reflections:0
+ )
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}
+"
+
+DOCS=( README.md CHANGES.md OTHERS TODO )
+PATCHES=(
+ "${FILESDIR}/${PV}-build.xml.patch"
+ "${FILESDIR}/${PV}-tests-exclude.patch"
+ "${FILESDIR}/4.2.2-makefile-flags.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml"
+EANT_BUILD_TARGET="jar contrib-jars"
+EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
+EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=${T}"
+EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+
+ EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
+ animal-sniffer-annotations,ant-core,asm-9)"
+
+ # Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS
+ # could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the
+ # variable's value, so define them in ANT_OPTS instead
+ ANT_OPTS="-DCC='$(tc-getCC)'"
+ # Parallel build does not respect dependency relationships between objects
+ ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
+}
+
+src_prepare() {
+ default
+
+ # Eliminate build.xml's dependency on bundled native JARs
+ sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||
+ die "Failed to delete lines referencing bundled JARs in build.xml"
+
+ # Clean up bundled JARs and libffi
+ java-pkg_clean
+ rm -r native/libffi || die "Failed to remove bundled libffi"
+
+ java-pkg-2_src_prepare
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "build/${PN}-min.jar"
+ java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar"
+ java-pkg_doso build/native-*/libjnidispatch.so
+ einstalldocs
+
+ use source && java-pkg_dosrc src/*
+ use doc && java-pkg_dojavadoc doc/javadoc
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/
@ 2016-05-11 21:07 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2016-05-11 21:07 UTC (permalink / raw
To: gentoo-commits
commit: f7351c4323d1ad8a2160879cde9038b60b41610b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 21:03:06 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed May 11 21:06:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7351c43
dev-java/jna: Version bump to 4.2.2, fixes #510796
Package-Manager: portage-2.2.28
dev-java/jna/Manifest | 1 +
dev-java/jna/files/4.2.2-build.xml.patch | 23 ++++++++
dev-java/jna/files/4.2.2-makefile-flags.patch | 25 +++++++++
dev-java/jna/jna-4.2.2.ebuild | 78 +++++++++++++++++++++++++++
dev-java/jna/metadata.xml | 2 +-
5 files changed, 128 insertions(+), 1 deletion(-)
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 2125bdc..1fd7c91 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,2 +1,3 @@
DIST jna-3.4.0.tar.gz 34547165 SHA256 bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14 SHA512 30c4e6a3a5ac133095248d3eb7d4983a91e11a267a581268a91316927ac75c5a133a58625d321276ac0b229c42c502f85492672d99713c90de98a648bd008b35 WHIRLPOOL 0a5a9d35db0e0090375235048c985fd8bd9ccf319d03c1c3db33e81d3e1a1bec8718a48f6b8180c7531d3963ae91b5337f539eb69e3db73b3f87ea693706fe08
DIST jna-3.4.1.tar.gz 35285043 SHA256 fb0ff552a11ddf18b82f1e3fbfe01985fb7a41e242124c63257bb685408ca16e SHA512 8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917 WHIRLPOOL 9c06862f76fbab7175f134a3f965d7d944ff536a03f03256307f8300b1fd1c9888c6e312bb74a80088128278efa9f8f7dfca668e4ebeacfff91bba3bc97951b0
+DIST jna-4.2.2.tar.gz 58638853 SHA256 46330123be97fa5c11b1747c74470a39f2b1a3396d66fd6ead4d034660eb094a SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f WHIRLPOOL a8cd562276c4e2955ad5aa178660810f6dd45d0bd51f1c267d1a8fd139f9fb6a45aaf794a03c9f333c51617240cbff0d79f57ce73e4fc341c431b3ab959055f1
diff --git a/dev-java/jna/files/4.2.2-build.xml.patch b/dev-java/jna/files/4.2.2-build.xml.patch
new file mode 100644
index 0000000..3647646
--- /dev/null
+++ b/dev-java/jna/files/4.2.2-build.xml.patch
@@ -0,0 +1,23 @@
+--- build.xml.orig 2016-03-16 14:37:28.000000000 +0000
++++ build.xml 2016-04-16 22:22:27.692967205 +0100
+@@ -320,7 +320,9 @@
+ <pathelement path="${build}/${jar}"/>
+ <pathelement path="${test.classes}"/>
+ <pathelement path="${build}/${testjar}"/>
++ <!--
+ <pathelement path="lib/clover.jar"/>
++ -->
+ <path refid="test.libs"/>
+ </path>
+ </target>
+@@ -909,8 +911,10 @@
+ <mkdir dir="${build}/jws"/>
+ <copy todir="${build}/jws" file="${build}/${jar}"/>
+ <copy todir="${build}/jws" file="${build}/${testjar}"/>
++ <!--
+ <copy todir="${build}/jws" file="lib/junit.jar"/>
+ <copy todir="${build}/jws" file="lib/clover.jar"/>
++ -->
+ <jar jarfile="${build}/jws/jnidispatch.jar">
+ <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+ </jar>
diff --git a/dev-java/jna/files/4.2.2-makefile-flags.patch b/dev-java/jna/files/4.2.2-makefile-flags.patch
new file mode 100644
index 0000000..10cf4b2
--- /dev/null
+++ b/dev-java/jna/files/4.2.2-makefile-flags.patch
@@ -0,0 +1,25 @@
+--- native/Makefile.orig 2016-03-16 14:37:28.000000000 +0000
++++ native/Makefile 2016-04-16 22:27:06.426345376 +0100
+@@ -81,7 +81,7 @@
+ LIBSFX=.so
+ ARSFX=.a
+ JNISFX=$(LIBSFX)
+-CC=gcc
++CC?=gcc
+ LD=$(CC)
+ LIBS=
+ # Default to Sun recommendations for JNI compilation
+@@ -94,10 +94,10 @@
+ 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)
diff --git a/dev-java/jna/jna-4.2.2.ebuild b/dev-java/jna/jna-4.2.2.ebuild
new file mode 100644
index 0000000..8d82418
--- /dev/null
+++ b/dev-java/jna/jna-4.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Java Native Access (JNA)"
+HOMEPAGE="https://github.com/twall/jna"
+SRC_URI="https://github.com/twall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="+awt +nio-buffers test"
+REQUIRED_USE="test? ( awt nio-buffers )"
+
+# The tests stall immediately on some systems (not current stable?) when
+# the sandbox is active but pass successfully otherwise. Chewi has not
+# been able to determine why. This began in 4.2.0 as 4.1.0 worked
+# fine. Someone bisect it please. :)
+RESTRICT="test"
+
+CDEPEND="virtual/libffi"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.7"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.7
+ virtual/pkgconfig
+ test? (
+ dev-java/ant-junit:0
+ dev-java/guava:18
+ dev-java/javassist:3
+ dev-java/reflections:0
+ )"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="native jar contrib-jars"
+EANT_EXTRA_ARGS="-Ddynlink.native=true"
+EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}"
+EANT_TEST_GENTOO_CLASSPATH="guava-18,javassist-3,reflections"
+
+java_prepare() {
+ # delete bundled jars and copy of libffi
+ # except native jars because build.xml needs them all
+ find ! -path "./lib/native/*" -name "*.jar" -delete || die
+ rm -r native/libffi || die
+
+ epatch "${FILESDIR}"/${PV}-build.xml.patch
+ # respect CFLAGS, don't inhibit warnings, honour CC
+ epatch "${FILESDIR}"/${PV}-makefile-flags.patch
+ tc-export CC
+
+ 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
+}
+
+src_install() {
+ java-pkg_newjar build/${PN}-min.jar
+ java-pkg_dojar contrib/platform/dist/${PN}-platform.jar
+ java-pkg_doso build/native-*/libjnidispatch.so
+
+ use source && java-pkg_dosrc src/*
+ use doc && java-pkg_dojavadoc doc/javadoc
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml
index a2357d2..ceb3d23 100644
--- a/dev-java/jna/metadata.xml
+++ b/dev-java/jna/metadata.xml
@@ -10,6 +10,6 @@
<flag name="nio-buffers">Enables support for NIO buffers</flag>
</use>
<upstream>
- <remote-id type="github">twall/jna#readme</remote-id>
+ <remote-id type="github">twall/jna</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-31 23:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-12 7:09 [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2022-05-31 23:46 Sam James
2022-01-08 8:57 Miroslav Šulc
2016-05-11 21:07 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox