diff options
| author | Bogdan Gheorghe | 2012-10-17 18:25:22 +0000 |
|---|---|---|
| committer | Bogdan Gheorghe | 2012-10-17 18:25:22 +0000 |
| commit | fcbb1cdf3500700816dceb4655c998ed64914d11 (patch) | |
| tree | 5e9a32015989fa539178a65b51b1c1dda6ac9c69 /bundles/org.eclipse.equinox.executable/library | |
| parent | 8a8b826b286cfbf2419c112ac172404611da2db9 (diff) | |
| download | rt.equinox.framework-fcbb1cdf3500700816dceb4655c998ed64914d11.tar.gz rt.equinox.framework-fcbb1cdf3500700816dceb4655c998ed64914d11.tar.xz rt.equinox.framework-fcbb1cdf3500700816dceb4655c998ed64914d11.zip | |
Build hpux ia64
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/gtk/build.sh | 67 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak | 4 |
2 files changed, 43 insertions, 28 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh index cc4c49a79..7f6a1dc18 100644 --- a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh +++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh @@ -51,6 +51,30 @@ if [ "${CC}" = "" ]; then export CC fi +# Parse the command line arguments and override the default values. +extraArgs="" +while [ "$1" != "" ]; do + if [ "$1" = "-os" ] && [ "$2" != "" ]; then + defaultOS="$2" + shift + elif [ "$1" = "-arch" ] && [ "$2" != "" ]; then + defaultOSArch="$2" + shift + elif [ "$1" = "-ws" ] && [ "$2" != "" ]; then + defaultWS="$2" + shift + elif [ "$1" = "-output" ] && [ "$2" != "" ]; then + programOutput="$2" + shift + elif [ "$1" = "-java" ] && [ "$2" != "" ]; then + javaHome="$2" + shift + else + extraArgs="$extraArgs $1" + fi + shift +done + case $OS in "Linux") makefile="make_linux.mak" @@ -108,9 +132,19 @@ case $OS in "HP-UX") makefile="make_hpux.mak" defaultOS="hpux" - defaultOSArch="ia64_32" - PATH=$PATH:/opt/hp-gcc/bin:/opt/gtk2.6/bin:/opt/gtk2.6/lib/pkgconfig - export PATH + case $defaultOSArch in + "ia64_32") + PATH=$PATH:/opt/hp-gcc/bin:/opt/gtk2.6/bin + PKG_CONFIG_PATH="/opt/gtk2.6/lib/pkgconfig" + ;; + "ia64") + PATH=$PATH:/opt/hp-gcc/bin:/opt/gtk_64bit/bin + PKG_CONFIG_PATH="/opt/gtk_64bit/lib/hpux64/pkgconfig" + ;; + *) + esac + ;; + export PATH PKG_CONFIG_PATH [ -d /opt/java1.5 ] && defaultJavaHome="/opt/java1.5" ;; "SunOS") @@ -144,29 +178,7 @@ case $OS in ;; esac export CC -# Parse the command line arguments and override the default values. -extraArgs="" -while [ "$1" != "" ]; do - if [ "$1" = "-os" ] && [ "$2" != "" ]; then - defaultOS="$2" - shift - elif [ "$1" = "-arch" ] && [ "$2" != "" ]; then - defaultOSArch="$2" - shift - elif [ "$1" = "-ws" ] && [ "$2" != "" ]; then - defaultWS="$2" - shift - elif [ "$1" = "-output" ] && [ "$2" != "" ]; then - programOutput="$2" - shift - elif [ "$1" = "-java" ] && [ "$2" != "" ]; then - javaHome="$2" - shift - else - extraArgs="$extraArgs $1" - fi - shift -done + # Set up environment variables needed by the makefiles. PROGRAM_OUTPUT="$programOutput" @@ -194,6 +206,9 @@ if [ "$defaultOSArch" = "ppc64" ]; then elif [ "$defaultOSArch" = "s390" ]; then M_ARCH=-m31 export M_ARCH +elif [ "$defaultOSArch" = "ia64" ]; then + M_ARCH=-mlp64 + export M_ARCH fi LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak b/bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak index 5d12d9081..7a73261d7 100644 --- a/bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak +++ b/bundles/org.eclipse.equinox.executable/library/gtk/make_hpux.mak @@ -40,9 +40,9 @@ DLL = $(PROGRAM_LIBRARY) LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lpthread -lrt GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so\"" -DGDK_LIB="\"libgdk-x11-2.0.so\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so\"" \ -DGOBJ_LIB="\"libgobject-2.0.so\"" -DX11_LIB="\"libX11.so\"" -LFLAGS = -shared -static-libgcc +LFLAGS = ${M_ARCH} -shared -static-libgcc # -Wl,--export-dynamic -CFLAGS = -O -s \ +CFLAGS = ${M_ARCH} -O -s \ -DNETSCAPE_FIX \ -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ |