From nobody Fri Jul 26 18:02:31 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WVwZb2L0Hz5R49F; Fri, 26 Jul 2024 18:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WVwZb1xG3z4Rvl; Fri, 26 Jul 2024 18:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722016951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dkJmpVCMORsPBI6L11dGhHkQL7CcVD07c8wK2YJdiZM=; b=FHztNot4bCBnf9PagPNN6wy+mLXSwkvxsO8kgm+f6/Gr461JM1xLPZ50x75m1vRANsMQvY B+gQ0KDB3LOfrxs/baP7fnbFSfrr85KQCZ2TaIYVC/aw83LBD1Z9ojd6WyD7Mfl3yMT01J /Q5Mpppl8K3qsphWBvCKK5nx9CC36kwH4xllkYKvrze48qnLQcd40OWL/7Ris2sujF6kTS +95pAIy+D/F+arThocQdWW54ge75ruEVWTNaE4aQGVSF31tJ8rIly5DZXzWiDo8AC4HHGy qBcABWCd5FxTOufma8iSFivt1yATIIi79bCzmzwBmAzzHITkJLTD8C7w1qBFWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722016951; a=rsa-sha256; cv=none; b=dMhqXDWMFpdKPt8j2uufGGTWhvu/RgfF56SkTaVn6k74e/PIFc73qCtnM0qPxo1CPvool+ clmbKNXSMwXlBw1S1Q0uDtDoU6F+jzhSDyQvnyB3mc5SQaMfieCPhs7bPXU3R8fzC0Sxow 3o+tFos8GoihClc9uECcKfSXgm5Pt0V2Nmg1P9E3QVi+6/trkPqlA7MHRQdKI4AFTmgj7r pZuPTZBdrnXaxxbhIEGxTBVqrosCoLNI5w9E4NPu92++D7kAmV0yeJ1E+lD/1mK04nU4wI l+60A6sbliPnPmxs9hj2OICzQ4FLEeYzj0LfAuFvD+y5972at0XLuidINJ0z3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722016951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dkJmpVCMORsPBI6L11dGhHkQL7CcVD07c8wK2YJdiZM=; b=fhcV7xf6SGRmT8Lwd28+ADWwOm6YnB8ta4V7PV1+PuR2gW45ktYjLe8K0857g3E7ipyd5o swdgCbwNgGwzcbtepUdfWeizq2RsLJUoTv/sDYeW+N3AEebFWrkNafF/asxrzQGL23z/Zm yDTXp03R3fNJeWN0Bge631FCVAJVpNRVENDYdySvBAl2rp6NGZ8NPBeTHZ11qB6bW+FzVV xudPkP6V9ophCqQv3LH1NXJ5Kx5wsgMhTBhPqkEPIrx3w3Kdw9EBGxbcxlv5hn2q20hxLm BJg0iRjwIGDWPBTgfA81hx9XL7OTyhxT/7ywMZa+6bbqgj8C6S05H0rIGNY3vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WVwZb1Yk5zYJ7; Fri, 26 Jul 2024 18:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46QI2VuE029285; Fri, 26 Jul 2024 18:02:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46QI2VmM029282; Fri, 26 Jul 2024 18:02:31 GMT (envelope-from git) Date: Fri, 26 Jul 2024 18:02:31 GMT Message-Id: <202407261802.46QI2VmM029282@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: e4f0d707502d - main - archivers/snappy-java: support build with OpenJDK 21 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4f0d707502db352c72aa6f4e5356b8c17b30531 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4f0d707502db352c72aa6f4e5356b8c17b30531 commit e4f0d707502db352c72aa6f4e5356b8c17b30531 Author: Vladimir Druzenko AuthorDate: 2024-07-26 17:54:22 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-26 17:54:22 +0000 archivers/snappy-java: support build with OpenJDK 21 In Java 21 compiler removed support for source and target 1.7 (7). PR: 280316 Approved by: Angelo Polo Obtained from: https://github.com/xerial/snappy-java/issues/532 --- archivers/snappy-java/files/patch-Makefile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/archivers/snappy-java/files/patch-Makefile b/archivers/snappy-java/files/patch-Makefile index 764688c0b255..ae6ab7e4591e 100644 --- a/archivers/snappy-java/files/patch-Makefile +++ b/archivers/snappy-java/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2023-10-08 13:55:19 UTC +--- Makefile.orig 2023-09-27 02:22:20 UTC +++ Makefile -@@ -4,7 +4,7 @@ include Makefile.common +@@ -4,7 +4,7 @@ MVN:=mvn $(info OS_NAME:$(OS_NAME), OS_ARCH:$(OS_ARCH)) MVN:=mvn @@ -9,7 +9,7 @@ all: snappy -@@ -17,7 +17,6 @@ SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy +@@ -17,7 +17,6 @@ SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log # Change this variable to use a specific git commit SNAPPY_GIT_REV:=$(SNAPPY_VERSION) SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log @@ -17,7 +17,7 @@ SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt BITSHUFFLE_ARCHIVE:=$(TARGET)/bitshuffle-$(BITSHUFFLE_VERSION).tar.gz -@@ -74,21 +73,12 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) +@@ -74,37 +73,28 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) $(TAR) xvfz $< -C $(TARGET) touch $@ @@ -41,7 +41,17 @@ snappy-header: $(SNAPPY_CMAKE_CACHE) -@@ -104,7 +94,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNati + $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: $(SRC)/org/xerial/snappy/SnappyNative.java + @mkdir -p $(TARGET)/jni-classes +- $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< ++ $(JAVAC) -source 8 -target 8 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< + + $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class + + $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xerial/snappy/BitShuffleNative.java + @mkdir -p $(TARGET)/jni-classes +- $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< ++ $(JAVAC) -source 8 -target 8 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class