* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2022-03-09 9:20 Agostino Sarubbo
0 siblings, 0 replies; 13+ messages in thread
From: Agostino Sarubbo @ 2022-03-09 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 416482c5bec1749b1c284bf5596aae06981d6c64
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 09:20:13 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 09:20:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416482c5
dev-java/lz4-java: ppc64 stable wrt bug #834097
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
index dcaf10bc45d5..cbec9c0f8f3f 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
# be packaged. Some extra steps are required before running the tests:
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2022-03-09 10:23 Jakov Smolić
0 siblings, 0 replies; 13+ messages in thread
From: Jakov Smolić @ 2022-03-09 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 12cbb4d2ab7769878de5da2d0c4d60edf072d5f8
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 10:23:33 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 10:23:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12cbb4d2
dev-java/lz4-java: Stabilize 1.8.0-r1 amd64, #834097
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
index cbec9c0f8f3f..12052a7d3ab4 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
# be packaged. Some extra steps are required before running the tests:
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2022-03-09 10:23 Jakov Smolić
0 siblings, 0 replies; 13+ messages in thread
From: Jakov Smolić @ 2022-03-09 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 212cd33c3fe303ae0858468dc3ebb5fa6b85ee85
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 10:23:39 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 10:23:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212cd33c
dev-java/lz4-java: Stabilize 1.8.0-r1 x86, #834097
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
index 12052a7d3ab4..bedad8c4cc56 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
# be packaged. Some extra steps are required before running the tests:
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2022-03-12 9:42 Arthur Zamarin
0 siblings, 0 replies; 13+ messages in thread
From: Arthur Zamarin @ 2022-03-12 9:42 UTC (permalink / raw
To: gentoo-commits
commit: e299d8c4b52dcade77e5ea44c7f0c753fa617bbb
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 09:42:36 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 09:42:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e299d8c4
dev-java/lz4-java: Stabilize 1.8.0-r1 arm64, #834097
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
index bedad8c4cc56..993a8803f183 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
# be packaged. Some extra steps are required before running the tests:
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2023-11-26 9:08 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2023-11-26 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 368a221ffad5353c066fd649c5e0d89749f86124
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Nov 11 20:00:28 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 09:08:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=368a221f
dev-java/lz4-java: update to newer mvel
Bug: https://bugs.gentoo.org/916973
Bug: https://bugs.gentoo.org/841236
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33617
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild | 97 ++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild
new file mode 100644
index 000000000000..45a7f75b6a3c
--- /dev/null
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.lz4:lz4-java:1.8.0"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="LZ4 compression for Java"
+HOMEPAGE="https://github.com/lz4/lz4-java"
+SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
+# be packaged. Some extra steps are required before running the tests:
+# 1. Download junit4-ant 2.7.x from https://mvnrepository.com/artifact/com.carrotsearch.randomizedtesting/junit4-ant
+# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to junit4-ant-2.7.*.jar
+# 3. ppc64 only: Install test dependencies that are unkeyworded
+# 4. Set ALLOW_TEST="all"
+RESTRICT="test"
+
+CDEPEND="
+ app-arch/lz4:=
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ dev-java/mvel:2.5
+ dev-libs/xxhash
+ test? (
+ dev-java/junit:4
+ dev-java/randomized-runner:0
+ )
+ ${CDEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}
+"
+
+# Ant is only needed to generate JNI headers;
+# the JNI shared object will be built by the custom Makefile
+EANT_BUILD_TARGET="compile-java generate-headers"
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Djava.io.tmpdir=${T}"
+EANT_TEST_GENTOO_CLASSPATH="randomized-runner"
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ local build_only_cp="$(java-pkg_getjars --build-only mvel-2.5)"
+ if [[ -z "${EANT_GENTOO_CLASSPATH_EXTRA}" ]]; then
+ EANT_GENTOO_CLASSPATH_EXTRA="${build_only_cp}"
+ else
+ EANT_GENTOO_CLASSPATH_EXTRA+=":${build_only_cp}"
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-print-os-props.patch"
+ eapply "${FILESDIR}/${P}-skip-ivy.patch"
+ cp "${FILESDIR}/${P}-r1-Makefile" Makefile || die "Failed to copy Makefile"
+ cp "${FILESDIR}/${P}-gentoo-classpath.xml" gentoo-classpath.xml ||
+ die "Failed to copy Gentoo classpath injection XML"
+ java-pkg-2_src_prepare
+ rm -r src/resources || die "Failed to remove pre-built shared libraries"
+}
+
+src_compile() {
+ java-pkg-2_src_compile
+ emake CC="$(tc-getCC)" JAVA_HOME="${JAVA_HOME}"
+ # JNI has already been built by the Makefile at this point
+ # Also pretend cpptasks is available, which is required by build.xml
+ EANT_EXTRA_ARGS+=" -Dcpptasks.available=true -Dskip.jni=true"
+ # Manually call 'ant jar' to include the JNI shared object in JAR
+ eant jar -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS}
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar 'dist/${ivy.module}.jar'
+ java-pkg_doso $(find build/jni -name "*.so")
+ use doc && java-pkg_dojavadoc build/docs
+ # Ant project's 'sources' target generates a source JAR rather than a Zip
+ # archive; we simply let java-utils-2.eclass create the source Zip archive
+ # from the same source directories the 'sources' target would access
+ # https://github.com/lz4/lz4-java/blob/1.8.0/build.xml#L323-L330
+ use source && java-pkg_dosrc src/java/* src/java-unsafe/*
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2023-11-27 8:54 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2023-11-27 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 61abf46d6542f7963e053001e4e0c23c3054c54f
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Nov 1 23:02:54 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 08:54:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61abf46d
dev-java/lz4-java: switch to java-pkg-simple
- uses java-pkg-simple.eclass instead of java-ant-2.eclass
- Java code generation with mvel translated to ebuild
- Building headers translated to ebuild using ejavac -h
- Building shared object file translated to ebuild with gcc according to
https://github.com/lz4/lz4-java/blob/1.8.0/build.xml#L206-L227
- Tests restricted. Would need sofile built into jar.
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r3.ebuild | 92 ++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r3.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r3.ebuild
new file mode 100644
index 000000000000..36385b98f07f
--- /dev/null
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.lz4:lz4-java:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="LZ4 compression for Java"
+HOMEPAGE="https://github.com/lz4/lz4-java"
+SRC_URI="https://github.com/lz4/lz4-java/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+# tests want sofile built into jar.
+# cannot find /net/jpountz/util/linux/amd64/liblz4-java.so
+RESTRICT="test"
+
+DEPEND="
+ app-arch/lz4:=
+ dev-java/mvel:2.5
+ dev-libs/xxhash:0
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/randomized-runner:0 )"
+RDEPEND="
+ app-arch/lz4:=
+ >=virtual/jre-1.8:*"
+
+DOCS=( CHANGES.md README.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.lz4.java"
+JAVA_SRC_DIR=( src/java{,-unsafe} )
+JAVA_TEST_GENTOO_CLASSPATH="junit-4 randomized-runner"
+JAVA_TEST_RESOURCE_DIRS="src/test-resources"
+JAVA_TEST_SRC_DIR="src/test"
+
+src_compile() {
+ # remove precompiled native libraries
+ rm -r src/resources || die
+
+ # cannot include template 'decompressor.template': file not found.]
+ cp src/build/source_templates/* . || die
+
+ einfo "Code generation"
+ "$(java-config -J)" \
+ -Dout.dir="src/java" \
+ -cp "$(java-pkg_getjars --build-only mvel-2.5)" \
+ org.mvel2.sh.Main \
+ src/build/gen_sources.mvel \
+ || die
+
+ java-pkg-simple_src_compile
+
+ einfo "Generate headers" # build.xml lines 194-204
+ ejavac -h build/jni-headers -classpath "target/classes" \
+ src/java/net/jpountz/xxhash/XXHashJNI.java \
+ src/java/net/jpountz/lz4/LZ4JNI.java || die
+
+ einfo "Generate native library"
+ # https://devmanual.gentoo.org/ebuild-writing/functions/src_compile/no-build-system
+ mkdir -p build/objects/src/jni
+ mkdir -p build/jni/net/jpountz/util/linux/amd64
+ "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
+ -I$(java-config -O)/../include -I$(java-config -O)/../include/linux \
+ -I$(java-config -O)/include -I$(java-config -O)/include/linux \
+ -Ibuild/jni-headers \
+ -c -o build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \
+ src/jni/net_jpountz_lz4_LZ4JNI.c
+ "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
+ -I$(java-config -O)/../include -I$(java-config -O)/../include/linux \
+ -I$(java-config -O)/include -I$(java-config -O)/include/linux \
+ -Ibuild/jni-headers \
+ -c -o build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o \
+ src/jni/net_jpountz_xxhash_XXHashJNI.c
+
+ "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
+ -shared \
+ -Wl,-soname,liblz4-java.so \
+ -o liblz4-java.so \
+ build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \
+ build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_doso liblz4-java.so
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2023-11-27 8:54 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2023-11-27 8:54 UTC (permalink / raw
To: gentoo-commits
commit: eece106c38f9f634c27bddadd2656dca5fc6e4a9
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Nov 26 20:12:07 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 08:54:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eece106c
dev-java/lz4-java: drop 1.8.0-r2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34000
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild | 97 ------------------------------
1 file changed, 97 deletions(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild
deleted file mode 100644
index 45a7f75b6a3c..000000000000
--- a/dev-java/lz4-java/lz4-java-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.lz4:lz4-java:1.8.0"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="LZ4 compression for Java"
-HOMEPAGE="https://github.com/lz4/lz4-java"
-SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
-# be packaged. Some extra steps are required before running the tests:
-# 1. Download junit4-ant 2.7.x from https://mvnrepository.com/artifact/com.carrotsearch.randomizedtesting/junit4-ant
-# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to junit4-ant-2.7.*.jar
-# 3. ppc64 only: Install test dependencies that are unkeyworded
-# 4. Set ALLOW_TEST="all"
-RESTRICT="test"
-
-CDEPEND="
- app-arch/lz4:=
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- dev-java/mvel:2.5
- dev-libs/xxhash
- test? (
- dev-java/junit:4
- dev-java/randomized-runner:0
- )
- ${CDEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
-
-# Ant is only needed to generate JNI headers;
-# the JNI shared object will be built by the custom Makefile
-EANT_BUILD_TARGET="compile-java generate-headers"
-EANT_DOC_TARGET="docs"
-EANT_EXTRA_ARGS="-Djava.io.tmpdir=${T}"
-EANT_TEST_GENTOO_CLASSPATH="randomized-runner"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- local build_only_cp="$(java-pkg_getjars --build-only mvel-2.5)"
- if [[ -z "${EANT_GENTOO_CLASSPATH_EXTRA}" ]]; then
- EANT_GENTOO_CLASSPATH_EXTRA="${build_only_cp}"
- else
- EANT_GENTOO_CLASSPATH_EXTRA+=":${build_only_cp}"
- fi
-}
-
-src_prepare() {
- eapply "${FILESDIR}/${P}-print-os-props.patch"
- eapply "${FILESDIR}/${P}-skip-ivy.patch"
- cp "${FILESDIR}/${P}-r1-Makefile" Makefile || die "Failed to copy Makefile"
- cp "${FILESDIR}/${P}-gentoo-classpath.xml" gentoo-classpath.xml ||
- die "Failed to copy Gentoo classpath injection XML"
- java-pkg-2_src_prepare
- rm -r src/resources || die "Failed to remove pre-built shared libraries"
-}
-
-src_compile() {
- java-pkg-2_src_compile
- emake CC="$(tc-getCC)" JAVA_HOME="${JAVA_HOME}"
- # JNI has already been built by the Makefile at this point
- # Also pretend cpptasks is available, which is required by build.xml
- EANT_EXTRA_ARGS+=" -Dcpptasks.available=true -Dskip.jni=true"
- # Manually call 'ant jar' to include the JNI shared object in JAR
- eant jar -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS}
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar 'dist/${ivy.module}.jar'
- java-pkg_doso $(find build/jni -name "*.so")
- use doc && java-pkg_dojavadoc build/docs
- # Ant project's 'sources' target generates a source JAR rather than a Zip
- # archive; we simply let java-utils-2.eclass create the source Zip archive
- # from the same source directories the 'sources' target would access
- # https://github.com/lz4/lz4-java/blob/1.8.0/build.xml#L323-L330
- use source && java-pkg_dosrc src/java/* src/java-unsafe/*
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2023-12-04 8:58 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2023-12-04 8:58 UTC (permalink / raw
To: gentoo-commits
commit: 5cea8e18d914dcd78aafb95a14176b7437c61f40
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Dec 3 07:54:02 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 08:54:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cea8e18
dev-java/lz4-java: simplify ebuild using java-pkg_get-jni-cflags
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34102
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
index 430ed388f301..76d25540b9e5 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
@@ -69,14 +69,12 @@ src_compile() {
mkdir -p build/objects/src/jni
mkdir -p build/jni/net/jpountz/util/linux/amd64
"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
- -I$(java-config -O)/../include -I$(java-config -O)/../include/linux \
- -I$(java-config -O)/include -I$(java-config -O)/include/linux \
+ $(java-pkg_get-jni-cflags) \
-Ibuild/jni-headers \
-c -o build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \
src/jni/net_jpountz_lz4_LZ4JNI.c
"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
- -I$(java-config -O)/../include -I$(java-config -O)/../include/linux \
- -I$(java-config -O)/include -I$(java-config -O)/include/linux \
+ $(java-pkg_get-jni-cflags) \
-Ibuild/jni-headers \
-c -o build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o \
src/jni/net_jpountz_xxhash_XXHashJNI.c
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2024-01-03 8:53 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-01-03 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 77e6a0566efeb18c2fae0695e9988696e124f122
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 08:52:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 08:52:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e6a056
dev-java/lz4-java: Stabilize 1.8.0-r4 arm64, #919137
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
index 76d25540b9e5..62f7a7157204 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
DEPEND="
app-arch/lz4:=
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2024-01-03 8:53 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-01-03 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 5df58c829c5ed188ec552f76002072a8fb0e0199
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 08:52:47 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 08:52:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5df58c82
dev-java/lz4-java: Stabilize 1.8.0-r4 amd64, #919137
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
index 62f7a7157204..072accbdec05 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
DEPEND="
app-arch/lz4:=
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2024-01-03 8:53 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-01-03 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 746be0168cd2faa176b733a524eeb2b33cd3a28b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 08:52:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 08:52:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746be016
dev-java/lz4-java: Stabilize 1.8.0-r4 ppc64, #919137
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
index 072accbdec05..25e97610721e 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
DEPEND="
app-arch/lz4:=
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2024-01-03 9:12 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-01-03 9:12 UTC (permalink / raw
To: gentoo-commits
commit: 2b9ebb9bbd36c6e52843d041e205f05980645ae3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 09:11:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 09:11:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9ebb9b
dev-java/lz4-java: Stabilize 1.8.0-r4 x86, #919137
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
index 25e97610721e..9e2b264421f8 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
app-arch/lz4:=
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/
@ 2024-08-11 12:12 Miroslav Šulc
0 siblings, 0 replies; 13+ messages in thread
From: Miroslav Šulc @ 2024-08-11 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 6100aff6a2842804a12f06c867ccc090281d7962
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Aug 10 12:28:06 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 12:10:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6100aff6
dev-java/lz4-java: fix java.lang.UnsatisfiedLinkError #936533
Closes: https://bugs.gentoo.org/936533
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37710
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../lz4-java/{lz4-java-1.8.0-r4.ebuild => lz4-java-1.8.0-r5.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
similarity index 97%
rename from dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
rename to dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
index 9e2b264421f8..1eca00a9a589 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
@@ -84,7 +84,7 @@ src_compile() {
-Wl,-soname,liblz4-java.so \
-o liblz4-java.so \
build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \
- build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4
+ build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4 -lxxhash
}
src_install() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-08-11 12:12 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-09 10:23 [gentoo-commits] repo/gentoo:master commit in: dev-java/lz4-java/ Jakov Smolić
-- strict thread matches above, loose matches on Subject: below --
2024-08-11 12:12 Miroslav Šulc
2024-01-03 9:12 Sam James
2024-01-03 8:53 Sam James
2024-01-03 8:53 Sam James
2024-01-03 8:53 Sam James
2023-12-04 8:58 Miroslav Šulc
2023-11-27 8:54 Miroslav Šulc
2023-11-27 8:54 Miroslav Šulc
2023-11-26 9:08 Miroslav Šulc
2022-03-12 9:42 Arthur Zamarin
2022-03-09 10:23 Jakov Smolić
2022-03-09 9:20 Agostino Sarubbo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox