Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 246080 Details for
Bug 429332
Providing 64-bit SWT libraries for Solaris/X86_64
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
patch for eclipse.platform.swt to allow for compiling SWT on Solaris x86_64
eclipse.platform.swt.patch1 (text/plain), 5.71 KB, created by
Thorsten Heit
on 2014-08-18 09:53:11 EDT
(
hide
)
Description:
patch for eclipse.platform.swt to allow for compiling SWT on Solaris x86_64
Filename:
MIME Type:
Creator:
Thorsten Heit
Created:
2014-08-18 09:53:11 EDT
Size:
5.71 KB
patch
obsolete
>diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh >index e319865..ed080c2 100644 >--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh >+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh >@@ -54,7 +54,9 @@ case $OS in > PROC=`uname -i` > MAKEFILE=make_solaris.mak > if [ "${MODEL}" = "" ]; then >- if uname -p > /dev/null 2>&1; then >+ if [ "`isainfo -b`" = "64" ]; then >+ MODEL=x86_64 >+ elif uname -p > /dev/null 2>&1; then > MODEL=`uname -p` > fi > fi >@@ -63,6 +65,10 @@ case $OS in > MAKEFILE=make_solaris_x86.mak > MAKE_TYPE=gmake > ;; >+ "x86_64") >+ MAKEFILE=make_solaris_x86_64.mak >+ MAKE_TYPE=gmake >+ ;; > esac > ;; > "FreeBSD") >@@ -258,6 +264,35 @@ case $SWT_OS.$SWT_ARCH in > export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue" > fi > ;; >+ "solaris.x86_64") >+ if [ "${CC}" = "" ]; then >+ export CC="cc -m64" >+ fi >+ if [ "${CXX}" = "" ]; then >+ export CXX="CC -m64" >+ fi >+ if [ "${JAVA_HOME}" = "" ]; then >+ export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50" >+ fi >+# if [ "${MOZILLA_SDK}" = "" ]; then >+# export MOZILLA_SDK="/bluebird/teamswt/bog/mozilla/solaris_x86/1.7/mozilla/dist/sdk" >+# fi >+# if [ "${XULRUNNER_SDK}" = "" ]; then >+# export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/solaris-x86/mozilla/dist/sdk" >+# fi >+# if [ "${MOZILLA_INCLUDES}" = "" ]; then >+# export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include" >+# fi >+# if [ "${MOZILLA_LIBS}" = "" ]; then >+# export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4" >+# fi >+# if [ "${XULRUNNER_INCLUDES}" = "" ]; then >+# export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include" >+# fi >+# if [ "${XULRUNNER_LIBS}" = "" ]; then >+# export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue" >+# fi >+ ;; > "solaris.sparc64") > # export PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin" > if [ "${CC}" = "" ]; then >@@ -466,8 +501,10 @@ if [ ${MODEL} = 'x86' -a ${SWT_OS} = 'linux' ]; then > fi > > if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" -a ${MODEL} != "sparc64" -a ${MODEL} != 'ia64' -a ${GTK_VERSION} != '3.0' ]; then >- echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" >- MAKE_GNOME=make_gnome >+ if [ "${SWT_OS}" != "solaris" -o "${MODEL}" != "x86_64" ]; then >+ echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" >+ MAKE_GNOME=make_gnome >+ fi > else > if [ ${GTK_VERSION} != '3.0' ]; then > echo "libgnome-2.0 and libgnomeui-2.0 not found:" >@@ -483,7 +520,7 @@ else > echo " *** Advanced graphics support using cairo will not be compiled." > fi > >-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then >+if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' -a ${MODEL} != 'x86_64' ]; 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` >diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml >index d206de5..d2f8339 100644 >--- a/bundles/org.eclipse.swt/buildSWT.xml >+++ b/bundles/org.eclipse.swt/buildSWT.xml >@@ -117,6 +117,10 @@ > <param name="library_count" value="8"/> > <param name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/> > </antcall> >+ <antcall target="check_fragment_libraries"> >+ <param name="library_count" value="6"/> >+ <param name="fragment" value="org.eclipse.swt.gtk.solaris.x86_64"/> >+ </antcall> > <!-- Motif is not being built > antcall target="check_fragment_libraries"> > <param name="library_count" value="9"/> >@@ -274,6 +278,13 @@ > trust="true" > outputproperty="m_solaris_x86_output" > command="hostname"/> >+ <sshexec host="${m_solaris_x86_64}" >+ username="swtbuild" >+ keyfile="${keyfile}" >+ failonerror="false" >+ trust="true" >+ outputproperty="m_solaris_x86_64_output" >+ command="hostname"/> > > <sshexec host="${m_aix}" > username="swtbuild" >@@ -349,6 +360,12 @@ > <matches pattern="x${m_solaris_x86_output}*" string="x${m_solaris_x86}"/> > </and> > </condition> >+ <condition property="m_solaris_x86_64_test" value="${success_msg}" else="${fail_msg}"> >+ <and> >+ <length string="${m_solaris_x86_64_output}" when="greater" length="0"/> >+ <matches pattern="x${m_solaris_x86_64_output}*" string="x${m_solaris_x86_64}"/> >+ </and> >+ </condition> > <condition property="m_aix_test" value="${success_msg}" else="${fail_msg}"> > <and> > <length string="${m_aix_output}" when="greater" length="0"/> >@@ -378,12 +395,13 @@ > <echo>${m_linux_ppc64} - ${m_linux_ppc64_test}</echo> > <echo>${m_solaris_sparc} - ${m_solaris_sparc_test}</echo> > <echo>${m_solaris_x86} - ${m_solaris_x86_test}</echo> >+ <echo>${m_solaris_x86_64} - ${m_solaris_x86_64_test}</echo> > <echo>${m_aix} - ${m_aix_test}</echo> > <echo>${m_hpux} - ${m_hpux_test}</echo> > <echo>${m_mac} - ${m_mac_test}</echo> > <echo>-------------------------</echo> > <condition property="m_fail"> >- <matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/> >+ <matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_solaris_x86_64_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/> > </condition> > <fail if="m_fail" message="Failed"/> > </target>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 429332
:
240404
|
240405
|
240460
| 246080 |
246081
|
246082
|
246083
|
246123