- Add activeHelpSample.jar patch.
- Change to Fedora M-build splash screen. - Add find patch courtesy Ziga Mahkovec (RH#149927#) - Build native stuff with -O2 on i386.
This commit is contained in:
Andrew Overholt
parent
f604149ae6
commit
f2593e92e4
66
eclipse.spec
66
eclipse.spec
|
|
@ -1,5 +1,5 @@
|
|||
Epoch: 1
|
||||
ExclusiveArch: i386 x86_64 ppc s390x
|
||||
ExclusiveArch: i386 x86_64 ppc
|
||||
|
||||
%define pkg_summary An open, extensible IDE
|
||||
%define section free
|
||||
|
|
@ -12,6 +12,14 @@ ExclusiveArch: i386 x86_64 ppc s390x
|
|||
%define libname libswt3
|
||||
%define build_id I20050219-1500
|
||||
|
||||
# All arches line up except i386 -> x86
|
||||
%ifarch %{ix86}
|
||||
%define eclipse_arch x86
|
||||
%endif
|
||||
%else
|
||||
%define eclipse_arch %{_arch}
|
||||
%endif
|
||||
|
||||
Summary: %{pkg_summary}
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
|
||||
|
|
@ -71,6 +79,11 @@ Patch13: %{name}-s390ands390x.patch
|
|||
Patch14: %{name}-s390ands390x2.patch
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=82916
|
||||
Patch15: %{name}-build-activeHelpSample.jar.patch
|
||||
# Make find work. See
|
||||
# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736
|
||||
# and
|
||||
#
|
||||
Patch16: %{name}-find.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: ant
|
||||
|
|
@ -213,6 +226,7 @@ pushd plugins/org.eclipse.platform.doc.isv
|
|||
rm -f activeHelpSample.jar
|
||||
%patch15 -p0
|
||||
popd
|
||||
%patch16 -p0
|
||||
|
||||
# Red Hat splash screen.
|
||||
pushd plugins/org.eclipse.platform
|
||||
|
|
@ -331,7 +345,7 @@ export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
|
|||
|
||||
# Build jdtcore.jar and jdtCompilerAdapter.jar
|
||||
ant \
|
||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{_arch} \
|
||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
|
||||
bootstrap
|
||||
|
||||
# Build a native ecj
|
||||
|
|
@ -356,25 +370,36 @@ export CLASSPATH=jdtcore.jar:jdtCompilerAdapter.jar:$CLASSPATH
|
|||
|
||||
ant \
|
||||
-Dnobootstrap=true \
|
||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{_arch} \
|
||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
|
||||
-Dlibsconfig=true
|
||||
|
||||
pushd result
|
||||
# De-compress resulting tarball ... yeah, it's a .zip but actually a .tar.gz
|
||||
# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
|
||||
tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{_arch}.zip
|
||||
tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
|
||||
|
||||
pushd eclipse
|
||||
|
||||
# Native build
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
for j in `find -name \*.jar`; do
|
||||
d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
|
||||
mkdir -p $d;
|
||||
s=`echo $j | sed "s:\./::"`;
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
|
||||
-o $d/`basename $j`.so $j;
|
||||
done
|
||||
# Native build -- do O2 on x86 only
|
||||
%ifarch %{ix86}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
for j in `find -name \*.jar`; do
|
||||
d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
|
||||
mkdir -p $d;
|
||||
s=`echo $j | sed "s:\./::"`;
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -O2 \
|
||||
-o $d/`basename $j`.so $j;
|
||||
done
|
||||
%else
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
for j in `find -name \*.jar`; do
|
||||
d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
|
||||
mkdir -p $d;
|
||||
s=`echo $j | sed "s:\./::"`;
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
|
||||
-o $d/`basename $j`.so $j;
|
||||
done
|
||||
%endif
|
||||
|
||||
## Remove ecj binary and re-build it
|
||||
#rm ../../ecj
|
||||
|
|
@ -410,7 +435,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
|
|||
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
|
||||
tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
|
||||
result/org.eclipse.sdk-%{build_id}-linux.gtk.%{_arch}.zip
|
||||
result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
|
||||
|
||||
# Binaries, libraries, and natively-built shared libraries
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
|
|
@ -443,15 +468,15 @@ pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
|
|||
ln -sf %{_libdir}/%{name}/eclipse eclipse
|
||||
|
||||
# JNI libraries
|
||||
cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{_arch}/libupdate.so \
|
||||
cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libupdate.so \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/
|
||||
cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{_arch}/libcore_*.so \
|
||||
cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libcore_*.so \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/
|
||||
suff=
|
||||
%ifarch alpha ia64 ppc64 sparc64 x86_64
|
||||
suff=64
|
||||
%endif
|
||||
cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{_arch}/libswt*.so \
|
||||
cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \
|
||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/
|
||||
popd
|
||||
|
||||
|
|
@ -968,12 +993,13 @@ fi
|
|||
%changelog
|
||||
* Mon Mar 07 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M5.12
|
||||
- Add activeHelpSample.jar patch.
|
||||
- Change to Fedora M-build Splash Screen.
|
||||
- Change to Fedora M-build splash screen.
|
||||
- Add find patch courtesy Ziga Mahkovec (RH#149927#)
|
||||
- Build native stuff with -O2 on i386.
|
||||
|
||||
* Mon Mar 07 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.11
|
||||
- Add s390 and s390x patches.
|
||||
- Don't build for s390, though, due to gcc bug.
|
||||
- Change %{eclipse_arch} to %{_arch} as the names all line up now.
|
||||
- Don't build for them, though, due to gcc bug and Eclipse building issue.
|
||||
- Add xorg-x11-devel BuildRequires.
|
||||
|
||||
* Fri Mar 04 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.10
|
||||
|
|
|
|||
Loading…
Reference in New Issue