diff options
Diffstat (limited to 'x11-toolkits/swt/files/patch-build.sh')
| -rw-r--r-- | x11-toolkits/swt/files/patch-build.sh | 119 |
1 files changed, 59 insertions, 60 deletions
diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh index 5cafeb3c5c63..9f1a5b611321 100644 --- a/x11-toolkits/swt/files/patch-build.sh +++ b/x11-toolkits/swt/files/patch-build.sh @@ -1,26 +1,44 @@ ---- build.sh.orig 2018-03-30 05:04:36 UTC +--- build.sh.orig 2019-03-07 02:31:04 UTC +++ build.sh -@@ -115,9 +115,19 @@ case $OS in - fi - fi +@@ -72,7 +72,7 @@ + + cd `dirname $0` + +-MAKE_TYPE=make ++MAKE_TYPE=gmake + + export CFLAGS='-O -Wall -fPIC' + +@@ -86,8 +86,8 @@ + MAKEFILE=make_win32.mak ;; -+ "DragonFly") -+ SWT_OS=dragonfly -+ MAKEFILE=make_dragonfly.mak -+ if uname -p > /dev/null 2>&1; then -+ MODEL=`uname -p` -+ fi -+ ;; - "FreeBSD") - SWT_OS=freebsd - MAKEFILE=make_freebsd.mak -+ if uname -p > /dev/null 2>&1; then -+ MODEL=`uname -p` -+ fi + *) +- SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` +- MAKEFILE=make_linux.mak ++ SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'` ++ MAKEFILE=make_${SWT_OS}.mak ;; - "Windows_NT") - SWT_OS=win32 -@@ -149,6 +159,10 @@ case $MODEL in + esac + +@@ -95,7 +95,7 @@ + if [ "${MODEL}" = "" ]; then + if uname -i > /dev/null 2>&1; then + MODEL=`uname -i` +- if [ ${MODEL} = 'unknown' ]; then ++ if [ ${MODEL} = 'unknown' ] || [ ${MODEL} = 'GENERIC' ]; then + MODEL=`uname -m` + fi + else +@@ -103,7 +103,7 @@ + fi + fi + case $MODEL in +- "x86_64") ++ "x86_64"|"amd64") + SWT_ARCH=x86_64 + AWT_ARCH=amd64 + ;; +@@ -111,6 +111,10 @@ SWT_ARCH=x86 AWT_ARCH=i386 ;; @@ -31,65 +49,46 @@ *) SWT_ARCH=$MODEL AWT_ARCH=$MODEL -@@ -469,10 +483,10 @@ esac +@@ -156,7 +160,7 @@ + # Cross-platform method of finding JAVA_HOME. + # Tested on Fedora 24 and Ubuntu 16 + DYNAMIC_JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"` +- if [ -a "${DYNAMIC_JAVA_HOME}include/jni.h" ]; then ++ if [ -a "${DYNAMIC_JAVA_HOME}include/freebsd/jni.h" ]; then + func_echo_plus "JAVA_HOME not set, but jni.h found, dynamically configured to $DYNAMIC_JAVA_HOME" + export JAVA_HOME="$DYNAMIC_JAVA_HOME" + else +@@ -194,10 +198,10 @@ # 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} == 'powerpc64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'amd64' ]; then +-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then ++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then - XLIB64=-L/usr/X11R6/lib64 + XLIB64=-L${LOCALBASE}/lib64 export XLIB64 fi - if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then -@@ -517,37 +531,24 @@ if [ ${MODEL} = 'ppc' -a ${SWT_OS} = 'linux' ]; then + if [ ${MODEL} = 'ppc64le' ]; then +@@ -214,11 +218,13 @@ export SWT_LFLAGS SWT_PTR_CFLAGS fi -- +if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library." MAKE_CAIRO=make_cairo else func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled." - fi +fi - --if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${SWT_OS} != 'solaris' ]; then -- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then -- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` -- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` -- export MOZILLA_INCLUDES -- export MOZILLA_LIBS -- MAKE_MOZILLA=make_mozilla -- elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then -- MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` -- MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` -- export MOZILLA_INCLUDES -- export MOZILLA_LIBS -- MAKE_MOZILLA=make_mozilla -- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then -- XULRUNNER_INCLUDES=`pkg-config --cflags libxul` -- XULRUNNER_LIBS=`pkg-config --libs libxul` -- export XULRUNNER_INCLUDES -- export XULRUNNER_LIBS -- MAKE_MOZILLA=make_xulrunner -- else -- func_echo_error "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM:" -- func_echo_error " >> Mozilla embedding support will not be compiled." -- fi -+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then -+ echo "Using libxul for gecko support" -+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul libxul-embedding` -+ XULRUNNER_LIBS=`pkg-config --libs libxul libxul-embedding` -+ export XULRUNNER_INCLUDES -+ export XULRUNNER_LIBS -+else -+ echo "None of the following libraries were found: XULRunner/XPCOM" -+ echo " *** Mozilla embedding support will not be compiled." fi # Find AWT if available +@@ -364,4 +370,4 @@ + elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then + export GTK_VERSION="3.0" + func_build_gtk3 "$@" +-fi +\ No newline at end of file ++fi |