mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Code Issues Releases Activity

archivers/snappy-java: fix build on aarch64

Browse Source 
PR:		247146
Submitted by:	Ronald Klop
Approved by:	Angelo Polo (maintainer)
This commit is contained in:
Mikael Urankar 2020-06-11 17:29:56 +00:00
parent 35c923ecd9
commit defe12367f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=538513
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archivers/snappy-java/Makefile
View File

@ -66,6 +66,8 @@ do-test:
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
PLATFORM_DIR_SUFFIX= FreeBSD-aarch64
. else . else
PLATFORM_DIR_SUFFIX= Default PLATFORM_DIR_SUFFIX= Default
. endif . endif

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

@ -1,19 +1,26 @@
--- Makefile.common.orig 2020-05-14 10:44:28 UTC --- Makefile.common.orig 2020-05-06 17:26:51 UTC
+++ Makefile.common +++ Makefile.common
@@ -45,7 +45,7 @@ endif @@ -45,7 +45,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 -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
+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 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-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-aarch64 FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64
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,13 @@ Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/i @@ -249,6 +249,20 @@ 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.jnilib
Mac-x86_64_SNAPPY_FLAGS := Mac-x86_64_SNAPPY_FLAGS :=
+ +
+FreeBSD-aarch64_CXX := $(CROSS_PREFIX)g++
+FreeBSD-aarch64_STRIP := $(CROSS_PREFIX)strip
+FreeBSD-aarch64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
+FreeBSD-aarch64_LINKFLAGS := -shared -static-libgcc
+FreeBSD-aarch64_LIBNAME := libsnappyjava.so
+FreeBSD-aarch64_SNAPPY_FLAGS :=
+
+FreeBSD-x86_CXX := $(CROSS_PREFIX)g++ +FreeBSD-x86_CXX := $(CROSS_PREFIX)g++
+FreeBSD-x86_STRIP := $(CROSS_PREFIX)strip +FreeBSD-x86_STRIP := $(CROSS_PREFIX)strip
+FreeBSD-x86_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden +FreeBSD-x86_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden