View | Details | Raw Unified | Return to bug 246348 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-27 / +43 lines)
Lines 1-22 Link Here
1
# Created by: Radim Kolar <hsn@filez.com>
1
# Created by: Radim Kolar <hsn@filez.com>
2
# $FreeBSD$
2
# $FreeBSD$
3
4
# Note to committers:
3
# Note to committers:
5
# With each version update, a new maven repository must be created and distributed
4
# With each version update, a new maven repository must be created and distributed
6
# so build is repeatable and cluster-safe.
5
# so build is repeatable and cluster-safe.
7
6
8
PORTNAME=	snappy
7
PORTNAME=	snappy
9
PORTVERSION=	1.0.4.1
8
PORTVERSION=	1.1.7.5
10
DISTVERSIONPREFIX=	snappy-java-
11
PORTREVISION=	2
12
CATEGORIES=	archivers java
9
CATEGORIES=	archivers java
13
MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/snappy/snappy-1.0.4.tar.gz/b69151652e82168bc5c643bcd6f07162/:source2 \
10
MASTER_SITES=	TODO:repo
14
		SF/bsdsrc/${.CURDIR:T}:source3
15
PKGNAMESUFFIX=	java
11
PKGNAMESUFFIX=	java
16
DISTFILES+=	snappy-${PORTVERSION:R}.tar.gz:source2 \
12
DISTFILES+=	${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo
17
		FreeBSD-snappy-${PORTVERSION}-maven-repository.tar.gz:source3
13
EXTRACT_ONLY=	xerial-${PORTNAME}-${PKGNAMESUFFIX}-${PORTVERSION}_GH0${EXTRACT_SUFX} \
18
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
14
		${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}
19
		FreeBSD-snappy-${PORTVERSION}-maven-repository.tar.gz
20
15
21
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
22
COMMENT=	Fast compressor/decompressor library
17
COMMENT=	Fast compressor/decompressor library
Lines 27-60 Link Here
27
BROKEN_armv7=		fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
22
BROKEN_armv7=		fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
28
BROKEN_powerpc64=	fails to build: failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.14.1:test
23
BROKEN_powerpc64=	fails to build: failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.14.1:test
29
24
30
BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3
25
BUILD_DEPENDS=	cmake:devel/cmake \
26
		sbt:devel/sbt
31
27
32
USE_GITHUB=	yes
33
GH_ACCOUNT=	xerial
34
GH_PROJECT=	snappy-java
35
36
USES=		gmake
28
USES=		gmake
37
USE_JAVA=	yes
29
USE_JAVA=	yes
38
USE_LDCONFIG=	yes
30
USE_LDCONFIG=	yes
39
MAKE_ARGS+=	Default_CXX=${CXX}
31
MAKE_ARGS+=	CXX="${CXX}"
32
TEST_TARGET=	test
33
BITSHUFFLE_V=	0.3.2
40
34
41
PLIST_FILES=	%%JAVAJARDIR%%/snappy-java.jar lib/libsnappyjava.so
35
USE_GITHUB=	yes
36
GH_ACCOUNT=	xerial \
37
		google:google \
38
		kiyo-masui:masui
39
GH_PROJECT=	snappy-java \
40
		snappy:google \
41
		bitshuffle:masui
42
GH_TAGNAME=	${PORTVERSION} \
43
		${PORTVERSION:R}:google \
44
		${BITSHUFFLE_V}:masui
42
45
43
post-patch:
46
PLIST_FILES=	${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so
44
	@${REINPLACE_CMD} -e 's|curl.*||g ; \
45
		s|MVN:=mvn|MVN:=${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/repository --offline|g' \
46
		${WRKSRC}/Makefile
47
47
48
do-build:
48
post-extract:
49
	@${MKDIR} ${WRKSRC}/target
49
	@${MKDIR} ${WRKSRC}/target
50
	@${CP} ${DISTDIR}/snappy-${PORTVERSION:R}.tar.gz ${WRKSRC}/target/
50
	@${RM} ${WRKSRC}/sbt
51
	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} \
51
	@${CP} ${DISTDIR}/google-snappy-${PORTVERSION:R}_GH0${EXTRACT_SUFX} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}
52
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/repository --offline test
52
	@${CP} ${DISTDIR}/kiyo-masui-bitshuffle-${BITSHUFFLE_V}_GH0${EXTRACT_SUFX} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}
53
53
54
do-build:
55
	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \
56
		${MAKE_CMD} ${MAKE_ARGS} SBT_IVY_HOME=${WRKDIR}/repository SBT_BOOT_DIR=${WRKDIR}/sbt_boot SBT_GLOBAL_DIR=${WRKDIR}/sbt_global
57
58
do-test:
59
	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \
60
		${MAKE_CMD} ${MAKE_ARGS} SBT_IVY_HOME=${WRKDIR}/repository SBT_BOOT_DIR=${WRKDIR}/sbt_boot SBT_GLOBAL_DIR=${WRKDIR}/sbt_global test
61
62
.include <bsd.port.pre.mk>
63
64
.if ${OPSYS} == FreeBSD && ${ARCH} == amd64
65
PLATFORM_DIR_SUFFIX=	FreeBSD-x86_64
66
.else
67
PLATFORM_DIR_SUFFIX=	Default
68
.endif
69
54
do-install:
70
do-install:
55
	${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${PORTVERSION}.jar \
71
	${INSTALL_DATA} ${WRKSRC}/target/snappy-java-${PORTVERSION}.jar \
56
		${STAGEDIR}${JAVAJARDIR}/snappy-java.jar
72
		${STAGEDIR}${JAVAJARDIR}/snappy-java.jar
57
	${INSTALL_LIB} ${WRKSRC}/target/snappy-${PORTVERSION:R}-Default/libsnappyjava.so \
73
	${INSTALL_LIB} ${WRKSRC}/target/snappy-${PORTVERSION:R}-${PLATFORM_DIR_SUFFIX}/libsnappyjava.so \
58
		${STAGEDIR}${LOCALBASE}/lib
74
		${STAGEDIR}${LOCALBASE}/lib
59
75
60
.include <bsd.port.mk>
76
.include <bsd.port.post.mk>
(-)distinfo (-6 / +9 lines)
Lines 1-6 Link Here
1
SHA256 (snappy-1.0.4.tar.gz) = 4ad91adb1592b6de67ecaad2ade6c34b9cf98a0bbc74ac8786b520b529b3bf61
1
TIMESTAMP = 1589051057
2
SIZE (snappy-1.0.4.tar.gz) = 1676541
2
SHA256 (snappy-java-repository-1.1.7.5.tar.gz) = 8025714a5ab5bcd91cf5f0da77465948247b5b2b1b5ebd02a14f4a1bec19e067
3
SHA256 (FreeBSD-snappy-1.0.4.1-maven-repository.tar.gz) = 1d258eedabd2ff74954988b7d404ac803f55687b916f697179489c3a4cb0e243
3
SIZE (snappy-java-repository-1.1.7.5.tar.gz) = 222476258
4
SIZE (FreeBSD-snappy-1.0.4.1-maven-repository.tar.gz) = 8290287
4
SHA256 (xerial-snappy-java-1.1.7.5_GH0.tar.gz) = af428168ae017944eb775e46ddc8e459365610fdde813e4542b9337aed479d93
5
SHA256 (xerial-snappy-java-snappy-java-1.0.4.1_GH0.tar.gz) = efb6d747d754779113b0c023886803c2daedb585b6ec80dd71ffa6a40a083f14
5
SIZE (xerial-snappy-java-1.1.7.5_GH0.tar.gz) = 3547828
6
SIZE (xerial-snappy-java-snappy-java-1.0.4.1_GH0.tar.gz) = 5475057
6
SHA256 (google-snappy-1.1.7_GH0.tar.gz) = 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4
7
SIZE (google-snappy-1.1.7_GH0.tar.gz) = 1090550
8
SHA256 (kiyo-masui-bitshuffle-0.3.2_GH0.tar.gz) = c0b97632fdcf26c67db2634fda70ac05c1679b5f4d4bc3674c5961bd515672e4
9
SIZE (kiyo-masui-bitshuffle-0.3.2_GH0.tar.gz) = 109279
(-)files/patch-Makefile (+64 lines)
Line 0 Link Here
1
--- Makefile.orig	2020-05-06 17:26:51 UTC
2
+++ Makefile
3
@@ -2,7 +2,7 @@
4
 include Makefile.common
5
 
6
 MVN:=mvn
7
-SBT:=./sbt
8
+SBT:=sbt -Dsbt.ivy.home=$(SBT_IVY_HOME) -Dsbt.offline=true -Dsbt.boot.directory=$(SBT_BOOT_DIR) -Dsbt.coursier=false -Dsbt.global.base=$(SBT_GLOBAL_DIR)
9
 
10
 all: snappy
11
 
12
@@ -25,7 +25,6 @@ BITSHUFFLE_UNPACKED:=$(TARGET)/bitshuffle-extracted.lo
13
 
14
 $(BITSHUFFLE_ARCHIVE):
15
 	@mkdir -p $(@D)
16
-	curl -L -o$@ https://github.com/kiyo-masui/bitshuffle/archive/$(BITSHUFFLE_VERSION).tar.gz
17
 
18
 $(BITSHUFFLE_UNPACKED): $(BITSHUFFLE_ARCHIVE)
19
 	$(TAR) xvfz $< -C $(TARGET)
20
@@ -65,26 +64,25 @@ endif
21
 
22
 $(SNAPPY_ARCHIVE):
23
 	@mkdir -p $(@D)
24
-	curl -L -o$@ https://github.com/google/snappy/releases/download/$(SNAPPY_VERSION)/snappy-$(SNAPPY_VERSION).tar.gz
25
 
26
 $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE)
27
 	$(TAR) xvfz $< -C $(TARGET)
28
 	touch $@
29
 
30
-$(SNAPPY_GIT_UNPACKED):
31
-	@mkdir -p $(SNAPPY_OUT)
32
-	rm -rf $(SNAPPY_SRC_DIR)
33
-	@mkdir -p $(SNAPPY_SRC_DIR)
34
-	git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)
35
-	git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
36
-	touch $@
37
+#$(SNAPPY_GIT_UNPACKED):
38
+#	@mkdir -p $(SNAPPY_OUT)
39
+#	rm -rf $(SNAPPY_SRC_DIR)
40
+#	@mkdir -p $(SNAPPY_SRC_DIR)
41
+#	git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR)
42
+#	git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
43
+#	touch $@
44
 
45
-$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED)
46
+$(SNAPPY_CMAKE_CACHE): $(SNAPPY_UNPACKED)
47
 	@mkdir -p $(SNAPPY_OUT)
48
 	cd $(SNAPPY_OUT) && cmake $(SNAPPY_CMAKE_OPTS) ../../$(SNAPPY_SRC_DIR)
49
 	touch $@
50
 
51
-jni-header: $(SNAPPY_GIT_UNPACKED) $(BITSHUFFLE_UNPACKED) $(SRC)/org/xerial/snappy/SnappyNative.h $(SRC)/org/xerial/snappy/BitShuffleNative.h
52
+jni-header: $(SNAPPY_UNPACKED) $(BITSHUFFLE_UNPACKED) $(SRC)/org/xerial/snappy/SnappyNative.h $(SRC)/org/xerial/snappy/BitShuffleNative.h
53
 
54
 snappy-header: $(SNAPPY_CMAKE_CACHE)
55
 
56
@@ -100,7 +98,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNati
57
 
58
 $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
59
 
60
-$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
61
+$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
62
 
63
 # aarch64 can use big-endian optimzied code
64
 ifeq ($(OS_ARCH),aarch64)
(-)files/patch-likelinux (-13 lines)
Lines 1-13 Link Here
1
--- Makefile.common.orig	2011-10-05 01:29:42 UTC
2
+++ Makefile.common
3
@@ -50,8 +50,8 @@ endif
4
 
5
 Default_CXX          := g++
6
 Default_STRIP        := strip
7
-Default_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
8
-Default_LINKFLAGS    := -shared -static
9
+Default_CXXFLAGS     := -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
10
+Default_LINKFLAGS    := -lc -shared
11
 Default_LIBNAME      := libsnappyjava.so
12
 Default_SNAPPY_FLAGS := 
13
 
(-)files/patch-project_plugins.sbt (+8 lines)
Line 0 Link Here
1
--- project/plugins.sbt.orig	2020-05-09 18:44:59 UTC
2
+++ project/plugins.sbt
3
@@ -4,5 +4,4 @@ addSbtPlugin("com.jsuereth"      % "sbt-pgp"      % "2
4
 addSbtPlugin("com.github.sbt"    % "sbt-findbugs" % "2.0.0")
5
 addSbtPlugin("com.github.sbt"    % "sbt-jacoco"   % "3.1.0")
6
 addSbtPlugin("com.typesafe.sbt"  % "sbt-osgi"     % "0.9.4")
7
-addSbtPlugin("io.get-coursier"   % "sbt-coursier" % "1.1.0-M7")
8
 addSbtPlugin("com.geirsson"      % "sbt-scalafmt" % "1.5.1")

Return to bug 246348