Tue Dec 9 13:22:56 2014 UTC ()
Fix build on SunOS.


(fhajny)
diff -r1.1 -r1.2 pkgsrc/devel/snappy-java10/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/snappy-java10/patches/patch-Makefile
diff -r1.1 -r1.2 pkgsrc/devel/snappy-java10/patches/patch-Makefile.common
cvs diff -r1.1 -r1.2 pkgsrc/devel/snappy-java10/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/distinfo 2014/04/24 16:15:43 1.1
+++ pkgsrc/devel/snappy-java10/distinfo 2014/12/09 13:22:56 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.1 2014/04/24 16:15:43 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2014/12/09 13:22:56 fhajny Exp $
2 2
3SHA1 (snappy-java10/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1 3SHA1 (snappy-java10/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1
4RMD160 (snappy-java10/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa 4RMD160 (snappy-java10/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa
5Size (snappy-java10/snappy-1.0.5.tar.gz) = 1731382 bytes 5Size (snappy-java10/snappy-1.0.5.tar.gz) = 1731382 bytes
6SHA1 (snappy-java10/snappy-java-1.0.5.jar) = f6fdc26b034b2a6a62f74b0a678ae6679ed6c201 6SHA1 (snappy-java10/snappy-java-1.0.5.jar) = f6fdc26b034b2a6a62f74b0a678ae6679ed6c201
7RMD160 (snappy-java10/snappy-java-1.0.5.jar) = 53140b9a4b33c66bbf24b601b0aee5931a8a7c2d 7RMD160 (snappy-java10/snappy-java-1.0.5.jar) = 53140b9a4b33c66bbf24b601b0aee5931a8a7c2d
8Size (snappy-java10/snappy-java-1.0.5.jar) = 1272779 bytes 8Size (snappy-java10/snappy-java-1.0.5.jar) = 1272779 bytes
9SHA1 (snappy-java10/snappy-java-1.0.5.tar.gz) = 61c9585aa64eba6cec77f9af61f0f5ea6fd418fb 9SHA1 (snappy-java10/snappy-java-1.0.5.tar.gz) = 61c9585aa64eba6cec77f9af61f0f5ea6fd418fb
10RMD160 (snappy-java10/snappy-java-1.0.5.tar.gz) = 65cf54742b55f4797dcc560215cca5cae1a11973 10RMD160 (snappy-java10/snappy-java-1.0.5.tar.gz) = 65cf54742b55f4797dcc560215cca5cae1a11973
11Size (snappy-java10/snappy-java-1.0.5.tar.gz) = 5739368 bytes 11Size (snappy-java10/snappy-java-1.0.5.tar.gz) = 5739368 bytes
12SHA1 (patch-Makefile) = da9cf7b0ff00374f3a45da06880b87bc9a1c729e 12SHA1 (patch-Makefile) = 1131f36b2b5532a5e84023b072e8a5bf41a9ad81
13SHA1 (patch-Makefile.common) = 9403c5f8a66f65dcd2b32f90c77d15bb7f196b18 13SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa
cvs diff -r1.1 -r1.2 pkgsrc/devel/snappy-java10/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/patches/patch-Makefile 2014/04/24 16:15:43 1.1
+++ pkgsrc/devel/snappy-java10/patches/patch-Makefile 2014/12/09 13:22:56 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-Makefile,v 1.1 2014/04/24 16:15:43 ryoon Exp $ 1$NetBSD: patch-Makefile,v 1.2 2014/12/09 13:22:56 fhajny Exp $
2 2
 3Add explicit NetBSD 64-bit target.
3--- Makefile.orig 2013-05-17 01:29:31.000000000 +0000 4--- Makefile.orig 2013-05-17 01:29:31.000000000 +0000
4+++ Makefile 5+++ Makefile
5@@ -97,6 +97,9 @@ linux32: 6@@ -97,6 +97,9 @@ linux32:
6 freebsd64: 7 freebsd64:
7 $(MAKE) native OS_NAME=FreeBSD OS_ARCH=amd64 8 $(MAKE) native OS_NAME=FreeBSD OS_ARCH=amd64
8  9
9+netbsd64: 10+netbsd64:
10+ $(MAKE) native OS_NAME=NetBSD OS_ARCH=amd64 11+ $(MAKE) native OS_NAME=NetBSD OS_ARCH=amd64
11+ 12+
12 # for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package 13 # for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package
13 linux-arm: 14 linux-arm:
14 $(MAKE) native CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm 15 $(MAKE) native CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm
cvs diff -r1.1 -r1.2 pkgsrc/devel/snappy-java10/patches/patch-Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/snappy-java10/patches/patch-Makefile.common 2014/04/24 16:15:43 1.1
+++ pkgsrc/devel/snappy-java10/patches/patch-Makefile.common 2014/12/09 13:22:56 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-Makefile.common,v 1.1 2014/04/24 16:15:43 ryoon Exp $ 1$NetBSD: patch-Makefile.common,v 1.2 2014/12/09 13:22:56 fhajny Exp $
 2
 3Add NetBSD and SunOS support.
2 4
3--- Makefile.common.orig 2013-03-28 06:27:26.000000000 +0000 5--- Makefile.common.orig 2013-03-28 06:27:26.000000000 +0000
4+++ Makefile.common 6+++ Makefile.common
5@@ -7,9 +7,9 @@ $(error Set JAVA_HOME environment variab 7@@ -7,9 +7,9 @@ $(error Set JAVA_HOME environment variab
6 endif 8 endif
7  9
8  10
9-JAVA := "$$JAVA_HOME/bin/java" 11-JAVA := "$$JAVA_HOME/bin/java"
10-JAVAC := "$$JAVA_HOME/bin/javac"  12-JAVAC := "$$JAVA_HOME/bin/javac"
11-JAVAH := "$$JAVA_HOME/bin/javah" 13-JAVAH := "$$JAVA_HOME/bin/javah"
12+JAVA := ${JAVA_HOME}/bin/java 14+JAVA := ${JAVA_HOME}/bin/java
13+JAVAC := ${JAVA_HOME}/bin/javac 15+JAVAC := ${JAVA_HOME}/bin/javac
14+JAVAH := ${JAVA_HOME}/bin/javah 16+JAVAH := ${JAVA_HOME}/bin/javah
@@ -22,39 +24,53 @@ $NetBSD: patch-Makefile.common,v 1.1 201 @@ -22,39 +24,53 @@ $NetBSD: patch-Makefile.common,v 1.1 201
22-jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h) 24-jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h)
23-ifneq ($(jni_md),) 25-ifneq ($(jni_md),)
24-jni_include := $(shell dirname "$(jni_md)") 26-jni_include := $(shell dirname "$(jni_md)")
25-endif 27-endif
26+#jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h) 28+#jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h)
27+#ifneq ($(jni_md),) 29+#ifneq ($(jni_md),)
28+#jni_include := $(shell dirname "$(jni_md)") 30+#jni_include := $(shell dirname "$(jni_md)")
29+#endif 31+#endif
30  32
31  33
32 # os=Default is meant to be generic unix/linux 34 # os=Default is meant to be generic unix/linux
33  35
34-known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 Windows-x86 Windows-amd64 36-known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 Windows-x86 Windows-amd64
35+known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 NetBSD-amd64 Windows-x86 Windows-amd64 37+known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 NetBSD-amd64 SunOS-x86 SunOS-amd64 Windows-x86 Windows-amd64
36 os_arch := $(OS_NAME)-$(OS_ARCH) 38 os_arch := $(OS_NAME)-$(OS_ARCH)
37  39
38 ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs))) 40 ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs)))
39@@ -112,6 +112,13 @@ FreeBSD-amd64_LINKFLAGS := -shared -s 41@@ -112,6 +112,27 @@ FreeBSD-amd64_LINKFLAGS := -shared -s
40 FreeBSD-amd64_LIBNAME := libsnappyjava.so 42 FreeBSD-amd64_LIBNAME := libsnappyjava.so
41 FreeBSD-amd64_SNAPPY_FLAGS :=  43 FreeBSD-amd64_SNAPPY_FLAGS :=
42  44
43+NetBSD-amd64_CXX := $(CROSS_PREFIX)g++ 45+NetBSD-amd64_CXX := $(CROSS_PREFIX)g++
44+NetBSD-amd64_STRIP := $(CROSS_PREFIX)strip 46+NetBSD-amd64_STRIP := $(CROSS_PREFIX)strip
45+NetBSD-amd64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden 47+NetBSD-amd64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
46+NetBSD-amd64_LINKFLAGS := -shared -static-libgcc 48+NetBSD-amd64_LINKFLAGS := -shared -static-libgcc
47+NetBSD-amd64_LIBNAME := libsnappyjava.so 49+NetBSD-amd64_LIBNAME := libsnappyjava.so
48+NetBSD-amd64_SNAPPY_FLAGS :=  50+NetBSD-amd64_SNAPPY_FLAGS :=
49+ 51+
 52+SunOS-x86_CXX := $(CROSS_PREFIX)g++
 53+SunOS-x86_STRIP := $(CROSS_PREFIX)strip
 54+SunOS-x86_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
 55+SunOS-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++
 56+SunOS-x86_LIBNAME := libsnappyjava.so
 57+SunOS-x86_SNAPPY_FLAGS :=
 58+
 59+SunOS-amd64_CXX := $(CROSS_PREFIX)g++
 60+SunOS-amd64_STRIP := $(CROSS_PREFIX)strip
 61+SunOS-amd64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
 62+SunOS-amd64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
 63+SunOS-amd64_LIBNAME := libsnappyjava.so
 64+SunOS-amd64_SNAPPY_FLAGS :=
 65+
50 Windows-x86_CXX := $(CROSS_PREFIX)g++ 66 Windows-x86_CXX := $(CROSS_PREFIX)g++
51 Windows-x86_STRIP := $(CROSS_PREFIX)strip 67 Windows-x86_STRIP := $(CROSS_PREFIX)strip
52 Windows-x86_CXXFLAGS := -Ilib/inc_win -O2  68 Windows-x86_CXXFLAGS := -Ilib/inc_win -O2
53@@ -138,6 +145,6 @@ SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAG 69@@ -138,6 +159,6 @@ SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAG
54  70
55 CXXFLAGS := $(CXXFLAGS) -Ilib/include  71 CXXFLAGS := $(CXXFLAGS) -Ilib/include
56 ifneq ($(jni_include),) 72 ifneq ($(jni_include),)
57-CXXFLAGS := $(CXXFLAGS) -I"$(jni_include)" 73-CXXFLAGS := $(CXXFLAGS) -I"$(jni_include)"
58+CXXFLAGS := $(CXXFLAGS) -I${JAVA_HOME}/include 74+CXXFLAGS := $(CXXFLAGS) -I${JAVA_HOME}/include
59 endif 75 endif
60  76