From 206bef988c5dfb8ec07f72ed820c48398643329f Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sat, 6 Sep 2008 19:31:51 +0000 Subject: . Update to Eclipse Ganymede Submitted by: "Stephane E. Potvin" --- ...eclipse.equinox.executable-library-gtk-build.sh | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh (limited to 'java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh') diff --git a/java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh b/java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh new file mode 100644 index 000000000000..58b6aa1e76cb --- /dev/null +++ b/java/eclipse-devel/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh @@ -0,0 +1,68 @@ +--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2008-08-02 22:30:31.469155349 -0400 ++++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2008-08-02 22:32:13.519781895 -0400 +@@ -53,6 +53,7 @@ + "Linux") + makefile="make_linux.mak" + defaultOS="linux" ++ MAKE=make + case $MODEL in + "x86_64") + defaultOSArch="x86_64" +@@ -93,9 +94,30 @@ + ;; + esac + ;; ++ "FreeBSD") ++ makefile="make_freebsd.mak" ++ defaultOS="freebsd" ++ MAKE=gmake ++ case $MODEL in ++ "amd64") ++ defaultOSArch="amd64" ++ defaultJava=DEFAULT_JAVA_EXEC ++ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; ++ i?86) ++ defaultOSArch="x86" ++ defaultJava=DEFAULT_JAVA_EXEC ++ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; ++ *) ++ echo "*** Unknown MODEL <${MODEL}>" ++ ;; ++ esac ++ ;; + "SunOS") + makefile="make_solaris.mak" + defaultOS="solaris" ++ MAKE=make + OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH + PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH +@@ -149,7 +171,7 @@ + DEFAULT_OS="$defaultOS" + DEFAULT_OS_ARCH="$defaultOSArch" + DEFAULT_WS="$defaultWS" +-JAVA_HOME=$javaHome ++#JAVA_HOME=$javaHome + DEFAULT_JAVA=$defaultJava + + export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA +@@ -157,13 +179,13 @@ + # If the OS is supported (a makefile exists) + if [ "$makefile" != "" ]; then + if [ "$extraArgs" != "" ]; then +- make -f $makefile $extraArgs ++ ${MAKE} -f $makefile $extraArgs + else + echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" +- make -f $makefile clean ++ ${MAKE} -f $makefile clean + case x$CC in +- x*gcc*) make -f $makefile all PICFLAG=-fpic ;; +- *) make -f $makefile all ;; ++ x*gcc*) ${MAKE} -f $makefile all PICFLAG=-fpic ;; ++ *) ${MAKE} -f $makefile all ;; + esac + fi + else -- cgit v1.2.3