Fix build on SunOS.

3 files changed, 25 insertions, 8 deletions

diff --git a/devel/snappy-java10/distinfo b/devel/snappy-java10/distinfo
index 8bb42978bb6..cb7718d874d 100644
--- a/devel/snappy-java10/distinfo
+++ b/devel/snappy-java10/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2014/04/24 16:15:43 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2014/12/09 13:22:56 fhajny Exp $
 
 SHA1 (snappy-java10/snappy-1.0.5.tar.gz) = 3a3df859cf33f78f8e945c3f67f28685f0f38bb1
 RMD160 (snappy-java10/snappy-1.0.5.tar.gz) = c9dec9a8a2faac7bf85b79bcf82f8080713103aa
@@ -9,5 +9,5 @@ Size (snappy-java10/snappy-java-1.0.5.jar) = 1272779 bytes
 SHA1 (snappy-java10/snappy-java-1.0.5.tar.gz) = 61c9585aa64eba6cec77f9af61f0f5ea6fd418fb
 RMD160 (snappy-java10/snappy-java-1.0.5.tar.gz) = 65cf54742b55f4797dcc560215cca5cae1a11973
 Size (snappy-java10/snappy-java-1.0.5.tar.gz) = 5739368 bytes
-SHA1 (patch-Makefile) = da9cf7b0ff00374f3a45da06880b87bc9a1c729e
-SHA1 (patch-Makefile.common) = 9403c5f8a66f65dcd2b32f90c77d15bb7f196b18
+SHA1 (patch-Makefile) = 1131f36b2b5532a5e84023b072e8a5bf41a9ad81
+SHA1 (patch-Makefile.common) = 83eeaf91c7dbd6ac3c4b3405d53acec9caa260aa
diff --git a/devel/snappy-java10/patches/patch-Makefile b/devel/snappy-java10/patches/patch-Makefile
index 1460132aed9..5dbcc8b13e3 100644
--- a/devel/snappy-java10/patches/patch-Makefile
+++ b/devel/snappy-java10/patches/patch-Makefile
@@ -1,5 +1,6 @@
-$NetBSD: patch-Makefile,v 1.1 2014/04/24 16:15:43 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.2 2014/12/09 13:22:56 fhajny Exp $
 
+Add explicit NetBSD 64-bit target.
 --- Makefile.orig	2013-05-17 01:29:31.000000000 +0000
 +++ Makefile
 @@ -97,6 +97,9 @@ linux32:
diff --git a/devel/snappy-java10/patches/patch-Makefile.common b/devel/snappy-java10/patches/patch-Makefile.common
index aba59337f7b..a0893560998 100644
--- a/devel/snappy-java10/patches/patch-Makefile.common
+++ b/devel/snappy-java10/patches/patch-Makefile.common
@@ -1,4 +1,6 @@
-$NetBSD: patch-Makefile.common,v 1.1 2014/04/24 16:15:43 ryoon Exp $
+$NetBSD: patch-Makefile.common,v 1.2 2014/12/09 13:22:56 fhajny Exp $
+
+Add NetBSD and SunOS support.
 
 --- Makefile.common.orig	2013-03-28 06:27:26.000000000 +0000
 +++ Makefile.common
@@ -32,11 +34,11 @@ $NetBSD: patch-Makefile.common,v 1.1 2014/04/24 16:15:43 ryoon Exp $
  # os=Default is meant to be generic unix/linux
  
 -known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 Windows-x86 Windows-amd64
-+known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 NetBSD-amd64 Windows-x86 Windows-amd64
++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
  os_arch := $(OS_NAME)-$(OS_ARCH)
  
  ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs)))
-@@ -112,6 +112,13 @@ FreeBSD-amd64_LINKFLAGS    := -shared -s
+@@ -112,6 +112,27 @@ FreeBSD-amd64_LINKFLAGS    := -shared -s
  FreeBSD-amd64_LIBNAME      := libsnappyjava.so
  FreeBSD-amd64_SNAPPY_FLAGS := 
  
@@ -47,10 +49,24 @@ $NetBSD: patch-Makefile.common,v 1.1 2014/04/24 16:15:43 ryoon Exp $
 +NetBSD-amd64_LIBNAME      := libsnappyjava.so
 +NetBSD-amd64_SNAPPY_FLAGS := 
 +
++SunOS-x86_CXX          := $(CROSS_PREFIX)g++
++SunOS-x86_STRIP        := $(CROSS_PREFIX)strip
++SunOS-x86_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
++SunOS-x86_LINKFLAGS    := -shared -static-libgcc -static-libstdc++
++SunOS-x86_LIBNAME      := libsnappyjava.so
++SunOS-x86_SNAPPY_FLAGS := 
++
++SunOS-amd64_CXX          := $(CROSS_PREFIX)g++
++SunOS-amd64_STRIP        := $(CROSS_PREFIX)strip
++SunOS-amd64_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
++SunOS-amd64_LINKFLAGS    := -shared -static-libgcc -static-libstdc++
++SunOS-amd64_LIBNAME      := libsnappyjava.so
++SunOS-amd64_SNAPPY_FLAGS := 
++
  Windows-x86_CXX          := $(CROSS_PREFIX)g++
  Windows-x86_STRIP        := $(CROSS_PREFIX)strip
  Windows-x86_CXXFLAGS     := -Ilib/inc_win -O2 
-@@ -138,6 +145,6 @@ SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAG
+@@ -138,6 +159,6 @@ SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAG
  
  CXXFLAGS := $(CXXFLAGS) -Ilib/include  
  ifneq ($(jni_include),)