|
Lines 1-84
Link Here
|
| 1 |
--- build.sh.orig 2018-03-01 07:35:22.000000000 +0100 |
1 |
--- build.sh.orig 2019-12-09 22:30:04 UTC |
| 2 |
+++ build.sh 2018-06-27 11:24:43.371971000 +0200 |
2 |
+++ build.sh |
| 3 |
@@ -115,9 +115,19 @@ |
3 |
@@ -72,7 +72,7 @@ echo -e "${RED}*** ${@}${NC}" |
| 4 |
fi |
4 |
|
| 5 |
fi |
5 |
cd `dirname $0` |
|
|
6 |
|
| 7 |
-MAKE_TYPE=make |
| 8 |
+MAKE_TYPE=gmake |
| 9 |
|
| 10 |
export CFLAGS='-O -Wall -fPIC' |
| 11 |
|
| 12 |
@@ -86,21 +86,14 @@ case $OS in |
| 13 |
MAKEFILE=make_win32.mak |
| 6 |
;; |
14 |
;; |
| 7 |
+ "DragonFly") |
15 |
*) |
| 8 |
+ SWT_OS=dragonfly |
16 |
- SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` |
| 9 |
+ MAKEFILE=make_dragonfly.mak |
17 |
+ SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'` |
| 10 |
+ if uname -p > /dev/null 2>&1; then |
18 |
MAKEFILE=make_linux.mak |
| 11 |
+ MODEL=`uname -p` |
|
|
| 12 |
+ fi |
| 13 |
+ ;; |
| 14 |
"FreeBSD") |
| 15 |
SWT_OS=freebsd |
| 16 |
MAKEFILE=make_freebsd.mak |
| 17 |
+ if uname -p > /dev/null 2>&1; then |
| 18 |
+ MODEL=`uname -p` |
| 19 |
+ fi |
| 20 |
;; |
19 |
;; |
| 21 |
"Windows_NT") |
20 |
esac |
| 22 |
SWT_OS=win32 |
|
|
| 23 |
@@ -469,10 +479,10 @@ |
| 24 |
|
21 |
|
|
|
22 |
# Determine which CPU type we are building for |
| 23 |
if [ "${MODEL}" = "" ]; then |
| 24 |
- if uname -i > /dev/null 2>&1; then |
| 25 |
- MODEL=`uname -i` |
| 26 |
- if [ ${MODEL} = 'unknown' ]; then |
| 27 |
- MODEL=`uname -m` |
| 28 |
- fi |
| 29 |
- else |
| 30 |
MODEL=`uname -m` |
| 31 |
- fi |
| 32 |
fi |
| 33 |
case $MODEL in |
| 34 |
"x86_64") |
| 35 |
@@ -111,6 +104,11 @@ case $MODEL in |
| 36 |
SWT_ARCH=x86 |
| 37 |
AWT_ARCH=i386 |
| 38 |
;; |
| 39 |
+ "powerpc" | "powerpc64") |
| 40 |
+ SWT_ARCH=ppc64 |
| 41 |
+ AWT_ARCH=ppc64 |
| 42 |
+ MODEL=`uname -p` |
| 43 |
+ ;; |
| 44 |
*) |
| 45 |
SWT_ARCH=$MODEL |
| 46 |
AWT_ARCH=$MODEL |
| 47 |
@@ -194,7 +192,7 @@ esac |
| 25 |
|
48 |
|
|
|
49 |
|
| 26 |
# For 64-bit CPUs, we have a switch |
50 |
# 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 |
51 |
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -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 |
52 |
+if [ ${MODEL} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' ]; then |
| 29 |
SWT_PTR_CFLAGS=-DJNI64 |
53 |
SWT_PTR_CFLAGS=-DJNI64 |
| 30 |
if [ -d /lib64 ]; then |
54 |
if [ -d /lib64 ]; then |
| 31 |
- XLIB64=-L/usr/X11R6/lib64 |
55 |
XLIB64=-L/usr/X11R6/lib64 |
| 32 |
+ XLIB64=-L${LOCALBASE}/lib64 |
56 |
@@ -205,6 +203,11 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MOD |
| 33 |
export XLIB64 |
57 |
XLIB64="${XLIB64} -L/usr/lib64" |
|
|
58 |
SWT_LFLAGS=-m64 |
| 59 |
export SWT_LFLAGS |
| 60 |
+ fi |
| 61 |
+ if [ ${SWT_OS} = "freebsd" ] |
| 62 |
+ then |
| 63 |
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64" |
| 64 |
+ export SWT_LFLAGS=-m64 |
| 34 |
fi |
65 |
fi |
| 35 |
if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then |
66 |
export SWT_PTR_CFLAGS |
| 36 |
@@ -517,37 +527,24 @@ |
|
|
| 37 |
export SWT_LFLAGS SWT_PTR_CFLAGS |
| 38 |
fi |
67 |
fi |
| 39 |
|
|
|
| 40 |
- |
| 41 |
+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then |
| 42 |
if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then |
| 43 |
func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library." |
| 44 |
MAKE_CAIRO=make_cairo |
| 45 |
else |
| 46 |
func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled." |
| 47 |
fi |
| 48 |
+fi |
| 49 |
|
| 50 |
-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${SWT_OS} != 'solaris' ]; then |
| 51 |
- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then |
| 52 |
- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` |
| 53 |
- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` |
| 54 |
- export MOZILLA_INCLUDES |
| 55 |
- export MOZILLA_LIBS |
| 56 |
- MAKE_MOZILLA=make_mozilla |
| 57 |
- elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then |
| 58 |
- MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` |
| 59 |
- MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` |
| 60 |
- export MOZILLA_INCLUDES |
| 61 |
- export MOZILLA_LIBS |
| 62 |
- MAKE_MOZILLA=make_mozilla |
| 63 |
- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then |
| 64 |
- XULRUNNER_INCLUDES=`pkg-config --cflags libxul` |
| 65 |
- XULRUNNER_LIBS=`pkg-config --libs libxul` |
| 66 |
- export XULRUNNER_INCLUDES |
| 67 |
- export XULRUNNER_LIBS |
| 68 |
- MAKE_MOZILLA=make_xulrunner |
| 69 |
- else |
| 70 |
- func_echo_error "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM:" |
| 71 |
- func_echo_error " >> Mozilla embedding support will not be compiled." |
| 72 |
- fi |
| 73 |
+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then |
| 74 |
+ echo "Using libxul for gecko support" |
| 75 |
+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul libxul-embedding` |
| 76 |
+ XULRUNNER_LIBS=`pkg-config --libs libxul libxul-embedding` |
| 77 |
+ export XULRUNNER_INCLUDES |
| 78 |
+ export XULRUNNER_LIBS |
| 79 |
+else |
| 80 |
+ echo "None of the following libraries were found: XULRunner/XPCOM" |
| 81 |
+ echo " *** Mozilla embedding support will not be compiled." |
| 82 |
fi |
| 83 |
|
| 84 |
# Find AWT if available |