View | Details | Raw Unified | Return to bug 247170
Collapse All | Expand All

(-)files/patch-build.sh (-6 / +17 lines)
Lines 1-6 Link Here
1
--- build.sh.orig	2018-03-01 07:35:22.000000000 +0100
1
--- build.sh.orig	2018-03-30 05:04:36 UTC
2
+++ build.sh	2018-06-27 11:24:43.371971000 +0200
2
+++ build.sh
3
@@ -115,9 +115,19 @@
3
@@ -115,9 +115,19 @@ case $OS in
4
 			fi
4
 			fi
5
 		fi
5
 		fi
6
 		;;
6
 		;;
Lines 20-31 Link Here
20
 		;;
20
 		;;
21
 	"Windows_NT")
21
 	"Windows_NT")
22
 		SWT_OS=win32
22
 		SWT_OS=win32
23
@@ -469,10 +479,10 @@
23
@@ -149,6 +159,10 @@ case $MODEL in
24
 		SWT_ARCH=x86
25
 		AWT_ARCH=i386
26
 		;;
27
+	powerpc64)
28
+		SWT_ARCH=ppc64
29
+		AWT_ARCH=ppc64
30
+		;;
31
 	*)
32
 		SWT_ARCH=$MODEL
33
 		AWT_ARCH=$MODEL
34
@@ -469,10 +483,10 @@ esac	
24
 
35
 
25
 
36
 
26
 # For 64-bit CPUs, we have a switch
37
 # For 64-bit CPUs, we have a switch
27
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9'  -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
38
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9'  -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
28
+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
39
+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
29
 	SWT_PTR_CFLAGS=-DJNI64
40
 	SWT_PTR_CFLAGS=-DJNI64
30
 	if [ -d /lib64 ]; then
41
 	if [ -d /lib64 ]; then
31
-		XLIB64=-L/usr/X11R6/lib64
42
-		XLIB64=-L/usr/X11R6/lib64
Lines 33-39 Link Here
33
 		export XLIB64
44
 		export XLIB64
34
 	fi
45
 	fi
35
 	if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
46
 	if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
36
@@ -517,37 +527,24 @@
47
@@ -517,37 +531,24 @@ if [ ${MODEL} = 'ppc' -a ${SWT_OS} = 'linux' ]; then
37
 	export SWT_LFLAGS SWT_PTR_CFLAGS
48
 	export SWT_LFLAGS SWT_PTR_CFLAGS
38
 fi
49
 fi
39
 
50
 

Return to bug 247170