- script path fixes

- x86_64 fixes
This commit is contained in:
Andrew Overholt 2005-01-15 05:30:33 +00:00
parent f358861271
commit 9e4bfeb3af

View File

@ -344,8 +344,8 @@ mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/'
suff= suff=
%ifarch alpha ia64 ppc64 sparc64 x86_64 %ifarch alpha ia64 ppc64 sparc64 x86_64
echo "gtk64" #echo "gtk64"
suff=.gtk64 #suff=.gtk64
%endif %endif
# Symlink some gtk sources. # Symlink some gtk sources.
@ -364,12 +364,13 @@ pushd "plugins/org.eclipse.swt${suff}/Eclipse SWT PI/gtk/library"
swtflags= swtflags=
%ifarch alpha ia64 ppc64 sparc64 x86_64 %ifarch alpha ia64 ppc64 sparc64 x86_64
swtflags='SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64' swtflags='SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64'
#%ifarch ia64 %ifarch x86_64
## Sigh. # Sigh.
#swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib" swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib64"
#%endif %else
%endif
swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib" swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib"
%endif
%endif
make \ make \
$swtflags \ $swtflags \
JAVA_HOME="%{java_home}" \ JAVA_HOME="%{java_home}" \
@ -680,6 +681,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%changelog %changelog
* Sat Jan 15 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.18
- script path fixes
- x86_64 fixes
* Fri Jan 14 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.17 * Fri Jan 14 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.17
- sed typo - sed typo