commit: b819bd52c31177a0778d87b528ad67dde1a5aef4 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Dec 10 08:53:44 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Dec 16 14:23:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b819bd52
dev-java/jffi: add 1.3.13 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39668/commits/2661bca950030bcfd36c7fc10f99224c85c6366a Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/jffi/Manifest | 1 + dev-java/jffi/files/jffi-1.3.13-GNUmakefile.patch | 40 +++++++++ dev-java/jffi/jffi-1.3.13.ebuild | 100 ++++++++++++++++++++++ 3 files changed, 141 insertions(+) diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest index 8a641aa1521d..1d5142066df4 100644 --- a/dev-java/jffi/Manifest +++ b/dev-java/jffi/Manifest @@ -1 +1,2 @@ DIST jffi-1.3.10.tar.gz 3304571 BLAKE2B a2ce4901d05b31cffcbe750e9a9294413057ae26426ae381f08ab07a085507afe38d447a60d4698d0878760ba1fe18bfdc31ce9b737676a70c93689d2e4533a7 SHA512 9e7d9aa1c16d7fa2486c75b71fd23465a3069ea3f314bc1b536115c982333d7cffa93f75a06ec86b740b83f4fca3be0c32cf99222d90bf1e6b45a9744ead1268 +DIST jffi-1.3.13.tar.gz 3345405 BLAKE2B ebbab23ae220c9178f93ee668be70b5f18aa62258773d07e0b5f2c0da83fad59e4641d0b70aef417bcd5566c8a1cc1258db28c5e2883691e89104e18611ba6a9 SHA512 81f598e14d303c89bb35d0edba5ae0a17f8920bfbbded9583987ba58b22713681cf00965bc75a7d19597f9697fd20a08607801b9c677024bfc112080955f6443 diff --git a/dev-java/jffi/files/jffi-1.3.13-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.13-GNUmakefile.patch new file mode 100644 index 000000000000..67e528cd15be --- /dev/null +++ b/dev-java/jffi/files/jffi-1.3.13-GNUmakefile.patch @@ -0,0 +1,40 @@ +diff --git a/jni/GNUmakefile b/jni/GNUmakefile +index 8ac84a6..3ac3091 100755 +--- a/jni/GNUmakefile ++++ b/jni/GNUmakefile +@@ -66,9 +66,11 @@ OFLAGS = -O2 $(JFLAGS) + WERROR = -Werror + ifneq ($(OS),darwin) + ifneq ($(OS),aix) ++ifneq ($(OS),linux) + WFLAGS += -Wundef $(WERROR) + endif + endif ++endif + WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter + PICFLAGS = -fPIC + SOFLAGS = # Filled in for each OS specifically +@@ -263,7 +265,7 @@ debug: + @echo "OBJS=$(OBJS)" + + $(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) +- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) $(LIBFFI_LIBS) + $(STRIP) $@ + ifeq ($(OS), darwin) + codesign -s - $@ +@@ -272,10 +274,14 @@ endif + $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h) + @mkdir -p $(@D) + @$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ ++ mkdir -p $(@D) ++ $(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ + + $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h) + @mkdir -p $(@D) + @$(CC) $(CFLAGS) -o $@ -c $< ++ mkdir -p $(@D) ++ $(CC) $(CFLAGS) -o $@ -c $< + + $(OBJS) : $(LIBFFI_LIBS) + diff --git a/dev-java/jffi/jffi-1.3.13.ebuild b/dev-java/jffi/jffi-1.3.13.ebuild new file mode 100644 index 000000000000..e9553b95cccf --- /dev/null +++ b/dev-java/jffi/jffi-1.3.13.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.github.jnr:jffi:1.3.13" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java Foreign Function Interface" +HOMEPAGE="https://github.com/jnr/jffi"; +SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"; +S="${WORKDIR}/${PN}-${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +DEPEND=" + >=virtual/jdk-1.8:* + >=dev-libs/libffi-3.4.2-r2:= +" + +RDEPEND=" + >=virtual/jre-1.8:* + >=dev-libs/libffi-3.4.2-r2:= +" + +PATCHES=( "${FILESDIR}"/jffi-1.3.13-GNUmakefile.patch ) + +JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.jffi" +JAVA_SRC_DIR="src/main/java" + +# https://github.com/jnr/jffi/blob/b6ad5c066a6346072ea04f8ffa8177204aadcb13/build.xml#L26 +JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + java-pkg-2_src_prepare + default + cat > src/main/java/com/kenai/jffi/Version.java <<-EOF + package com.kenai.jffi; + import java.lang.annotation.Native; + public final class Version { + private Version() {} + @Native + public static final int MAJOR = $(ver_cut 1); + @Native + public static final int MINOR = $(ver_cut 2); + @Native + public static final int MICRO = $(ver_cut 3); + } + EOF +} + +src_compile() { + java-pkg-simple_src_compile + + # generate headers + mkdir -p build/jni + javac -h build/jni -classpath target/classes \ + ${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \ + || die + + #build native library. + local args=( + SRC_DIR=jni + JNI_DIR=jni + BUILD_DIR=build/jni + VERSION=$(ver_cut 1-2) + USE_SYSTEM_LIBFFI=1 + CCACHE= + -f jni/GNUmakefile + ) + emake "${args[@]}" +} + +src_test() { + # build native test library + emake BUILD_DIR=build -f libtest/GNUmakefile + + # https://github.com/jnr/jffi/issues/60 + LC_ALL=C java-pkg-simple_src_test +} + +src_install() { + local libname=".so" + java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname} + + # must be after _doso to have JAVA_PKG_LIBDEST set + cat > boot.properties <<-EOF + jffi.boot.library.path = ${JAVA_PKG_LIBDEST} + EOF + jar -uf ${PN}.jar boot.properties || die + + java-pkg-simple_src_install +}
