git: e4f0d707502d - main - archivers/snappy-java: support build with OpenJDK 21
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 26 Jul 2024 18:02:31 UTC
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4f0d707502db352c72aa6f4e5356b8c17b30531 commit e4f0d707502db352c72aa6f4e5356b8c17b30531 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-07-26 17:54:22 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> 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 <language.devel@gmail.com> 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