diff options
Diffstat (limited to 'x11-toolkits/swt/files/patch-build.sh')
| -rw-r--r-- | x11-toolkits/swt/files/patch-build.sh | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh index 07d0e596eae1..6a5a8a47d4b4 100644 --- a/x11-toolkits/swt/files/patch-build.sh +++ b/x11-toolkits/swt/files/patch-build.sh @@ -1,26 +1,17 @@ ---- build.sh.orig Mon Nov 21 23:48:16 2005 -+++ build.sh Fri Dec 1 16:34:03 2006 -@@ -31,6 +31,10 @@ - SWT_OS=solaris - MAKEFILE=make_solaris.mak - ;; -+ "FreeBSD") -+ SWT_OS=freebsd -+ MAKEFILE=make_freebsd.mak -+ ;; - *) - SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` - MAKEFILE=make_linux.mak -@@ -61,7 +65,7 @@ +--- build.sh.orig Thu May 31 18:04:22 2007 ++++ build.sh Mon Jun 11 18:25:04 2007 +@@ -65,15 +65,16 @@ esac # For 64-bit CPUs, we have a switch --if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' ]; then -+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'amd64' ]; then +-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then ++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 export SWT_PTR_CFLAGS if [ -d /lib64 ]; then -@@ -70,6 +74,7 @@ +- XLIB64=-L/usr/X11R6/lib64 ++ XLIB64=-L${X11BASE}/lib64 + export XLIB64 fi fi @@ -28,7 +19,7 @@ if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" MAKE_GNOME=make_gnome -@@ -77,7 +82,9 @@ +@@ -81,7 +82,9 @@ echo "libgnome-2.0 and libgnomeui-2.0 not found:" echo " *** SWT Program support for GNOME will not be compiled." fi @@ -38,28 +29,21 @@ if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then echo "Cairo found, compiling SWT support for the cairo graphics library." MAKE_CAIRO=make_cairo -@@ -85,7 +92,9 @@ +@@ -89,7 +92,9 @@ echo "Cairo not found:" echo " *** Advanced graphics support using cairo will not be compiled." fi +fi +if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then - if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then + if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then - GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom` -@@ -98,6 +107,7 @@ + MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` +@@ -107,6 +112,7 @@ + echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:" echo " *** Mozilla embedding support will not be compiled." fi - fi +fi + fi # Find AWT if available - if [ -z "${AWT_LIB_PATH}" ]; then -@@ -126,5 +136,5 @@ - if [ "x${1}" = "xclean" ]; then - make -f $MAKEFILE clean - else -- make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} -+ make -f $MAKEFILE all ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} - fi |