From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31C42158094 for ; Sat, 9 Jul 2022 11:40:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57963E077C; Sat, 9 Jul 2022 11:40:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29BB2E077C for ; Sat, 9 Jul 2022 11:40:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12C07340E9E for ; Sat, 9 Jul 2022 11:40:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72ABA391 for ; Sat, 9 Jul 2022 11:40:38 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1657366831.e1fc551759d6b83c9c22e9898c420aa1bb2aedec.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/, dev-java/jffi/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jffi/Manifest dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch dev-java/jffi/jffi-1.3.6.ebuild X-VCS-Directories: dev-java/jffi/files/ dev-java/jffi/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: e1fc551759d6b83c9c22e9898c420aa1bb2aedec X-VCS-Branch: master Date: Sat, 9 Jul 2022 11:40:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b2919831-47b4-414e-a15a-2485b312ac90 X-Archives-Hash: cad03d7eb45ea120ae9e83c4f68f4e82 commit: e1fc551759d6b83c9c22e9898c420aa1bb2aedec Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jul 9 11:38:43 2022 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jul 9 11:40:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fc5517 dev-java/jffi: Revert drop 1.3.6 Reverts: d4842e912cca55b92e24188983878aff444a0820 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/jffi/Manifest | 1 + dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch | 26 +++++++ dev-java/jffi/jffi-1.3.6.ebuild | 98 ++++++++++++++++++++++++ 3 files changed, 125 insertions(+) diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest index 40f970c22ac6..46f96ebc4d8b 100644 --- a/dev-java/jffi/Manifest +++ b/dev-java/jffi/Manifest @@ -1,2 +1,3 @@ DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4 +DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9 SHA512 0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10 diff --git a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch new file mode 100644 index 000000000000..2dd5e9d8791a --- /dev/null +++ b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch @@ -0,0 +1,26 @@ +diff --git a/jni/GNUmakefile b/jni/GNUmakefile +index c0f298c..457626f 100755 +--- a/jni/GNUmakefile ++++ b/jni/GNUmakefile +@@ -278,16 +278,16 @@ debug: + @echo "OBJS=$(OBJS)" + + $(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) +- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) ++ $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS) + $(STRIP) $@ + + $(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) + diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild new file mode 100644 index 000000000000..f34b51d92cc2 --- /dev/null +++ b/dev-java/jffi/jffi-1.3.6.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.6.tar.gz --slot 1.3 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.6.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.github.jnr:jffi:1.3.6" +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/refs/tags/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="1.2" +KEYWORDS="amd64 arm64 ~ppc64 x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}"/jffi-1.3.6-GNUmakefile.patch ) +DOCS=( LICENSE README.md ) + +S="${WORKDIR}/${PN}-${P}" + +JAVA_SRC_DIR="src/main/java" + +# https://github.com/jnr/jffi/blob/eabdf09c3ec4fc8a54b684ff326e36b36b74e0da/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() { + 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() { + default + + 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 +}