mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

x11-toolkits/swt: fix build on powerpc64

Browse Source 
build.sh misses some powerpc64 conditionals.

PR:		247170
Approved by:	makc (maintainer)
This commit is contained in:
Piotr Kubaj 2020-06-11 19:26:14 +00:00
parent 507d9d1188
commit cffd94b8d6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=538531
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
x11-toolkits/swt/files/patch-build.sh
View File

@ -1,6 +1,6 @@
--- build.sh.orig 2018-03-01 07:35:22.000000000 +0100
+++ build.sh 2018-06-27 11:24:43.371971000 +0200
@@ -115,9 +115,19 @@
--- build.sh.orig 2018-03-30 05:04:36 UTC
+++ build.sh
@@ -115,9 +115,19 @@ case $OS in
fi
fi
;;
@ -20,12 +20,23 @@
;;
"Windows_NT")
SWT_OS=win32
@@ -469,10 +479,10 @@
@@ -149,6 +159,10 @@ case $MODEL in
SWT_ARCH=x86
AWT_ARCH=i386
;;
+ powerpc64)
+ SWT_ARCH=ppc64
+ AWT_ARCH=ppc64
+ ;;
*)
SWT_ARCH=$MODEL
AWT_ARCH=$MODEL
@@ -469,10 +483,10 @@ esac
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'amd64' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} == 'powerpc64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'amd64' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
- XLIB64=-L/usr/X11R6/lib64
@ -33,7 +44,7 @@
export XLIB64
fi
if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
@@ -517,37 +527,24 @@
@@ -517,37 +531,24 @@ if [ ${MODEL} = 'ppc' -a ${SWT_OS} = 'linux' ]; then
export SWT_LFLAGS SWT_PTR_CFLAGS
fi