freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

archivers/snappy-java: Update to 1.1.10.5

Browse Source 
PR:		268558
Reported by:	wcarson.bugzilla@disillusion.net
Co-authored-by:	Angelo Polo <language.devel@gmail.com>
This commit is contained in:
Juraj Lutter
2023-10-18 15:45:54 +02:00
parent 0b94f89b6a
commit ec69541aaa
5 changed files with 92 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
archivers/snappy-java/Makefile
View File

@@ -3,13 +3,17 @@
# and distributed so build is repeatable and cluster-safe. # and distributed so build is repeatable and cluster-safe.
PORTNAME= snappy PORTNAME= snappy
PORTVERSION= 1.1.7.5 DISTVERSIONPREFIX= v
DISTVERSION= 1.1.10.5
CATEGORIES= archivers java CATEGORIES= archivers java
MASTER_SITES= LOCAL/pi:repo MASTER_SITES= LOCAL/otis:repo
PKGNAMESUFFIX= java PKGNAMESUFFIX= java
DISTFILES+= ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo
EXTRACT_ONLY= ${DISTFILE_DEFAULT} \ EXTRACT_ONLY= ${DISTFILE_DEFAULT} \
${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX} ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX} \
${DISTFILE_google_benchmark} \
${DISTFILE_google_googletest}
MAINTAINER= language.devel@gmail.com MAINTAINER= language.devel@gmail.com
COMMENT= Fast compressor/decompressor library COMMENT= Fast compressor/decompressor library
@@ -17,37 +21,43 @@ WWW= https://github.com/xerial/snappy-java
LICENSE= APACHE20 LICENSE= APACHE20
BROKEN_armv6= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes BROKEN_armv6= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
BROKEN_armv7= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes BROKEN_armv7= fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
BUILD_DEPENDS= cmake:devel/cmake-core \ BUILD_DEPENDS= cmake:devel/cmake-core \
sbt:devel/sbt sbt:devel/sbt
USES= gmake USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= xerial
GH_PROJECT= snappy-java
GH_TAGNAME= ${DISTVERSIONFULL}
GH_TUPLE= google:snappy:${DISTVERSION:R}:google \
google:benchmark:d572f47:google_benchmark/google_benchmark \
google:googletest:b796f7d:google_googletest/google_googletest \
kiyo-masui:bitshuffle:${BITSHUFFLE_V}:masui
USE_JAVA= yes USE_JAVA= yes
USE_LDCONFIG= yes USE_LDCONFIG= yes
MAKE_ARGS+= CXX="${CXX}" MAKE_ARGS+= CXX="${CXX}"
TEST_TARGET= test TEST_TARGET= test
BITSHUFFLE_V= 0.3.2 BITSHUFFLE_V= 0.3.4
USE_GITHUB= yes PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar \
GH_ACCOUNT= xerial \ lib/libsnappyjava.so
google:google \
kiyo-masui:masui
GH_PROJECT= snappy-java \
snappy:google \
bitshuffle:masui
GH_TAGNAME= ${PORTVERSION} \
${PORTVERSION:R}:google \
${BITSHUFFLE_V}:masui
PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so .include <bsd.port.pre.mk>
post-extract: post-extract:
@${MKDIR} ${WRKSRC}/target ${MKDIR} ${WRKSRC}/target
@${RM} ${WRKSRC}/sbt ${RM} ${WRKSRC}/sbt
@${CP} ${DISTDIR}/${DISTFILE_google} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX} ${CP} ${DISTDIR}/${DISTFILE_google} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}
@${CP} ${DISTDIR}/${DISTFILE_masui} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX} ${CP} ${DISTDIR}/${DISTFILE_masui} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}
(cd ${WRKSRC}/google_benchmark && \
${COPYTREE_SHARE} . ${WRKSRC}/target/snappy-${PORTVERSION:R}/third_party/benchmark)
(cd ${WRKSRC}/google_googletest && \
${COPYTREE_SHARE} . ${WRKSRC}/target/snappy-${PORTVERSION:R}/third_party/googletest)
do-build: do-build:
cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \ cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \
@@ -57,28 +67,26 @@ do-test:
cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \ cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \
${MAKE_CMD} ${MAKE_ARGS} SBT_IVY_HOME=${WRKDIR}/repository SBT_BOOT_DIR=${WRKDIR}/sbt_boot SBT_GLOBAL_DIR=${WRKDIR}/sbt_global test ${MAKE_CMD} ${MAKE_ARGS} SBT_IVY_HOME=${WRKDIR}/repository SBT_BOOT_DIR=${WRKDIR}/sbt_boot SBT_GLOBAL_DIR=${WRKDIR}/sbt_global test
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD .if ${OPSYS} == FreeBSD
. if ${ARCH} == amd64 . if ${ARCH} == amd64
PLATFORM_DIR_SUFFIX= FreeBSD-x86_64 PLATFORM_DIR_SUFFIX= FreeBSD-x86_64
. elif ${ARCH} == i386 . elif ${ARCH} == i386
PLATFORM_DIR_SUFFIX= FreeBSD-x86 PLATFORM_DIR_SUFFIX= FreeBSD-x86
. elif ${ARCH} == aarch64 . elif ${ARCH} == aarch64
PLATFORM_DIR_SUFFIX= FreeBSD-aarch64 PLATFORM_DIR_SUFFIX= FreeBSD-aarch64
. elif ${ARCH} == powerpc64 . elif ${ARCH} == powerpc64
PLATFORM_DIR_SUFFIX= FreeBSD-ppc64 PLATFORM_DIR_SUFFIX= FreeBSD-ppc64
. elif ${ARCH} == powerpc64le . elif ${ARCH} == powerpc64le
PLATFORM_DIR_SUFFIX= FreeBSD-ppc64le PLATFORM_DIR_SUFFIX= FreeBSD-ppc64le
. else . else
PLATFORM_DIR_SUFFIX= Default PLATFORM_DIR_SUFFIX= Default
. endif . endif
.else .else
PLATFORM_DIR_SUFFIX= Default PLATFORM_DIR_SUFFIX= Default
.endif .endif
do-install: do-install:
${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${PORTVERSION}.jar \ ${INSTALL_DATA} ${WRKSRC}/target/snappy-java-*.jar \
${STAGEDIR}${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${JAVAJARDIR}/snappy-java.jar
${INSTALL_LIB} ${WRKSRC}/target/snappy-${PORTVERSION:R}-${PLATFORM_DIR_SUFFIX}/libsnappyjava.so \ ${INSTALL_LIB} ${WRKSRC}/target/snappy-${PORTVERSION:R}-${PLATFORM_DIR_SUFFIX}/libsnappyjava.so \
${STAGEDIR}${LOCALBASE}/lib ${STAGEDIR}${LOCALBASE}/lib

22
archivers/snappy-java/distinfo
View File

@@ -1,9 +1,13 @@
TIMESTAMP = 1589051057 TIMESTAMP = 1696787613
SHA256 (snappy-java-repository-1.1.7.5.tar.gz) = 8025714a5ab5bcd91cf5f0da77465948247b5b2b1b5ebd02a14f4a1bec19e067 SHA256 (xerial-snappy-java-v1.1.10.5_GH0.tar.gz) = dcec78c80eab4cd2841cb70f924cb1b9344d94481e84c45adbb5cb8cfc1c372f
SIZE (snappy-java-repository-1.1.7.5.tar.gz) = 222476258 SIZE (xerial-snappy-java-v1.1.10.5_GH0.tar.gz) = 3917442
SHA256 (xerial-snappy-java-1.1.7.5_GH0.tar.gz) = af428168ae017944eb775e46ddc8e459365610fdde813e4542b9337aed479d93 SHA256 (snappy-java-repository-1.1.10.5.tar.gz) = 45fc41e1109d1b6bb6727808b6aed04d4bfb589012fb955906e82da9283156c7
SIZE (xerial-snappy-java-1.1.7.5_GH0.tar.gz) = 3547828 SIZE (snappy-java-repository-1.1.10.5.tar.gz) = 235195392
SHA256 (google-snappy-1.1.7_GH0.tar.gz) = 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 SHA256 (google-snappy-1.1.10_GH0.tar.gz) = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
SIZE (google-snappy-1.1.7_GH0.tar.gz) = 1090550 SIZE (google-snappy-1.1.10_GH0.tar.gz) = 1105312
SHA256 (kiyo-masui-bitshuffle-0.3.2_GH0.tar.gz) = c0b97632fdcf26c67db2634fda70ac05c1679b5f4d4bc3674c5961bd515672e4 SHA256 (google-benchmark-d572f47_GH0.tar.gz) = 3ed2c88e1067c347031f77d5ea8b40e95a1cd4562badac361418160c23d6f000
SIZE (kiyo-masui-bitshuffle-0.3.2_GH0.tar.gz) = 109279 SIZE (google-benchmark-d572f47_GH0.tar.gz) = 196565
SHA256 (google-googletest-b796f7d_GH0.tar.gz) = 00fda32f69c4b9f980f1a3166626e9ba74a2e92ff42dc15242e05be369364708
SIZE (google-googletest-b796f7d_GH0.tar.gz) = 862944
SHA256 (kiyo-masui-bitshuffle-0.3.4_GH0.tar.gz) = 275a5f329b9eba2e4e7a540e8a4211f01a919a59f2b428299da680c7f0a15c3e
SIZE (kiyo-masui-bitshuffle-0.3.4_GH0.tar.gz) = 110150

46
archivers/snappy-java/files/patch-Makefile
View File

@@ -1,7 +1,7 @@
--- Makefile.orig 2020-05-06 17:26:51 UTC --- Makefile.orig 2023-10-08 13:55:19 UTC
+++ Makefile +++ Makefile
@@ -2,7 +2,7 @@ @@ -4,7 +4,7 @@ include Makefile.common
include Makefile.common $(info OS_NAME:$(OS_NAME), OS_ARCH:$(OS_ARCH))
MVN:=mvn MVN:=mvn
-SBT:=./sbt -SBT:=./sbt
@@ -9,42 +9,30 @@
all: snappy all: snappy
@@ -25,7 +25,6 @@ BITSHUFFLE_UNPACKED:=$(TARGET)/bitshuffle-extracted.lo @@ -17,7 +17,6 @@ SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
# Change this variable to use a specific git commit
SNAPPY_GIT_REV:=$(SNAPPY_VERSION)
SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
-SNAPPY_GIT_UNPACKED:=$(TARGET)/snappy-git-extracted.log
SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt
$(BITSHUFFLE_ARCHIVE): BITSHUFFLE_ARCHIVE:=$(TARGET)/bitshuffle-$(BITSHUFFLE_VERSION).tar.gz
@mkdir -p $(@D) @@ -74,21 +73,12 @@ $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
- curl -L -o$@ https://github.com/kiyo-masui/bitshuffle/archive/$(BITSHUFFLE_VERSION).tar.gz
$(BITSHUFFLE_UNPACKED): $(BITSHUFFLE_ARCHIVE)
$(TAR) xvfz $< -C $(TARGET)
@@ -65,26 +64,25 @@ endif
$(SNAPPY_ARCHIVE):
@mkdir -p $(@D)
- curl -L -o$@ https://github.com/google/snappy/releases/download/$(SNAPPY_VERSION)/snappy-$(SNAPPY_VERSION).tar.gz
$(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
$(TAR) xvfz $< -C $(TARGET) $(TAR) xvfz $< -C $(TARGET)
touch $@ touch $@
-$(SNAPPY_GIT_UNPACKED): -$(SNAPPY_GIT_UNPACKED):
- @mkdir -p $(SNAPPY_OUT) +$(SNAPPY_CMAKE_CACHE): $(SNAPPY_UNPACKED)
@mkdir -p $(SNAPPY_OUT)
- rm -rf $(SNAPPY_SRC_DIR) - rm -rf $(SNAPPY_SRC_DIR)
- @mkdir -p $(SNAPPY_SRC_DIR) - @mkdir -p $(SNAPPY_SRC_DIR)
- git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR) - git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)
- git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV) - git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
- cd $(SNAPPY_SRC_DIR) && git submodule update --init
- touch $@ - touch $@
+#$(SNAPPY_GIT_UNPACKED): -
+# @mkdir -p $(SNAPPY_OUT)
+# rm -rf $(SNAPPY_SRC_DIR)
+# @mkdir -p $(SNAPPY_SRC_DIR)
+# git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)
+# git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
+# touch $@
-$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED) -$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED)
+$(SNAPPY_CMAKE_CACHE): $(SNAPPY_UNPACKED) - @mkdir -p $(SNAPPY_OUT)
@mkdir -p $(SNAPPY_OUT)
cd $(SNAPPY_OUT) && cmake $(SNAPPY_CMAKE_OPTS) ../../$(SNAPPY_SRC_DIR) cd $(SNAPPY_OUT) && cmake $(SNAPPY_CMAKE_OPTS) ../../$(SNAPPY_SRC_DIR)
touch $@ touch $@
@@ -53,7 +41,7 @@
snappy-header: $(SNAPPY_CMAKE_CACHE) snappy-header: $(SNAPPY_CMAKE_CACHE)
@@ -100,7 +98,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNati @@ -104,7 +94,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNati
$(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class

31
archivers/snappy-java/files/patch-Makefile.common
View File

@@ -1,17 +1,32 @@
--- Makefile.common.orig 2020-05-06 17:26:51 UTC --- Makefile.common.orig 2023-09-27 02:22:20 UTC
+++ Makefile.common +++ Makefile.common
@@ -45,7 +45,7 @@ endif @@ -29,8 +29,13 @@ IBM_JDK_LIB := lib/inc_ibm
ifeq ($(OS_NAME),Mac)
ENDIANESS:="Little Endian"
else
-ENDIANESS:=$(shell lscpu | grep "Byte Order" |cut -d ":" -f2)
+_btord:=$(shell sysctl -n hw.byteorder)
+ifeq ($(_btord),1234)
+ENDIANESS:="Little Endian"
+else
+ENDIANESS:="Big Endian"
endif
+endif
# Windows uses different path separators
ifeq ($(OS_NAME),Windows)
@@ -51,7 +56,7 @@ endif
# os=Default is meant to be generic unix/linux # os=Default is meant to be generic unix/linux
-known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 # To support new CPU architecture, add a new target name here
+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-aarch64 FreeBSD-ppc64 FreeBSD-ppc64le FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 -known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64
+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-aarch64 FreeBSD-ppc64 FreeBSD-ppc64le FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64
os_arch := $(OS_NAME)-$(OS_ARCH) os_arch := $(OS_NAME)-$(OS_ARCH)
IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7")) IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7"))
@@ -249,6 +249,34 @@ Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/i @@ -262,6 +267,34 @@ Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/i
Mac-x86_64_LINKFLAGS := -dynamiclib Mac-x86_64_LINKFLAGS := -dynamiclib
Mac-x86_64_LIBNAME := libsnappyjava.jnilib Mac-x86_64_LIBNAME := libsnappyjava.dylib
Mac-x86_64_SNAPPY_FLAGS := Mac-x86_64_SNAPPY_FLAGS :=
+ +
+FreeBSD-aarch64_CXX := $(CROSS_PREFIX)g++ +FreeBSD-aarch64_CXX := $(CROSS_PREFIX)g++
@@ -42,5 +57,5 @@
+FreeBSD-x86_LIBNAME := libsnappyjava.so +FreeBSD-x86_LIBNAME := libsnappyjava.so
+FreeBSD-x86_SNAPPY_FLAGS := +FreeBSD-x86_SNAPPY_FLAGS :=
FreeBSD-x86_64_CXX := $(CROSS_PREFIX)g++ Mac-aarch64_CXX := c++ -arch arm64
FreeBSD-x86_64_STRIP := $(CROSS_PREFIX)strip Mac-aarch64_STRIP := strip -x

8
archivers/snappy-java/files/patch-project_plugins.sbt
View File

@@ -1,8 +0,0 @@
--- project/plugins.sbt.orig 2020-05-09 18:44:59 UTC
+++ project/plugins.sbt
@@ -4,5 +4,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2
addSbtPlugin("com.github.sbt" % "sbt-findbugs" % "2.0.0")
addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.1.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M7")
addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1")