summaryrefslogtreecommitdiff
path: root/java/eclipse-devel/files/patch-features-equinox-executable-library-gtk-build.sh
diff options
context:
space:
mode:
Diffstat (limited to 'java/eclipse-devel/files/patch-features-equinox-executable-library-gtk-build.sh')
-rw-r--r--java/eclipse-devel/files/patch-features-equinox-executable-library-gtk-build.sh30
1 files changed, 28 insertions, 2 deletions
diff --git a/java/eclipse-devel/files/patch-features-equinox-executable-library-gtk-build.sh b/java/eclipse-devel/files/patch-features-equinox-executable-library-gtk-build.sh
index 9d0befce6b19..60227e2bb485 100644
--- a/java/eclipse-devel/files/patch-features-equinox-executable-library-gtk-build.sh
+++ b/java/eclipse-devel/files/patch-features-equinox-executable-library-gtk-build.sh
@@ -1,5 +1,5 @@
---- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2007-06-26 04:57:45.000000000 +0900
-+++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2007-08-25 14:35:16.000000000 +0900
+--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2007-09-22 01:59:40.000000000 +0900
++++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2007-10-20 18:57:55.000000000 +0900
@@ -10,6 +10,9 @@
# IBM Corporation - initial API and implementation
# Kevin Cornell (Rational Software Corporation)
@@ -36,3 +36,29 @@
"Linux")
makefile="make_linux.mak"
defaultOS="linux"
+@@ -148,7 +170,6 @@
+ DEFAULT_OS="$defaultOS"
+ DEFAULT_OS_ARCH="$defaultOSArch"
+ DEFAULT_WS="$defaultWS"
+-JAVA_HOME=$javaHome
+ DEFAULT_JAVA=$defaultJava
+
+ export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA
+@@ -156,13 +177,13 @@
+ # If the OS is supported (a makefile exists)
+ if [ "$makefile" != "" ]; then
+ if [ "$extraArgs" != "" ]; then
+- make -f $makefile $extraArgs
++ gmake -f $makefile $extraArgs
+ else
+ echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS"
+- make -f $makefile clean
++ gmake -f $makefile clean
+ case x$CC in
+- x*gcc*) make -f $makefile all PICFLAG=-fpic ;;
+- *) make -f $makefile all ;;
++ x*gcc*) gmake -f $makefile all PICFLAG=-fpic ;;
++ *) gmake -f $makefile all ;;
+ esac
+ fi
+ else