rpms/java-1.4.2-gcj-compat/devel bootstrap-temp.patch, NONE, 1.1 java-1.4.2-gcj-compat.spec, 1.74, 1.75
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 7 16:12:05 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15863
Modified Files:
java-1.4.2-gcj-compat.spec
Added Files:
bootstrap-temp.patch
Log Message:
Bootstrapping take 2
bootstrap-temp.patch:
aot-compile-rpm.in | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE bootstrap-temp.patch ---
--- java-gcj-compat-1.0.31/aot-compile-rpm.in~ 2005-07-07 11:48:23.000000000 +0100
+++ java-gcj-compat-1.0.31/aot-compile-rpm.in 2005-07-07 17:07:53.000000000 +0100
@@ -136,7 +136,7 @@
def split_jarfile(src, dir, split = 1500):
"""In order to avoid #158308 we must split large jarfiles on PPC."""
- if os.environ.get("RPM_ARCH") != "ppc":
+ if os.environ.get("RPM_ARCH") not in ("ppc", "ppc64"):
return [src.filename]
items = src.infolist()
if len([i for i in items if i.filename.endswith(".class")]) < split:
Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- java-1.4.2-gcj-compat.spec 7 Jul 2005 15:47:38 -0000 1.74
+++ java-1.4.2-gcj-compat.spec 7 Jul 2005 16:12:01 -0000 1.75
@@ -44,6 +44,7 @@
Source0: java-gcj-compat-%{jgcver}.tar.gz
#Source1: bcprov-jdk14-%{bcarchivever}.tar.gz
Source2: eclipse-ecj-3.1.0_fc-2.jar
+Patch1: bootstrap-temp.patch
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: jpackage-utils >= 0:1.5, sed
BuildRequires: gcc%{gccsuffix}-java >= %{gccver}
@@ -106,6 +107,7 @@
%prep
%setup -q -n java-gcj-compat-%{jgcver}
+%patch1 -p1 -b .orig
%build
%if %{custom}
@@ -132,13 +134,12 @@
# popd
%if %{bootstrap}
-cp -a %{SOURCE2} eclipse-ecj.jar
-gcj -shared $RPM_OPT_FLAGS -fPIC \
- -findirect-dispatch -Wl,-Bsymbolic \
- eclipse-ecj.jar -o eclipse-ecj.jar.so
-gcj-dbtool -n eclipse-ecj.jar.db 64
-gcj-dbtool -f eclipse-ecj.jar.db \
- eclipse-ecj.jar %{_libdir}/gcj/%{name}/eclipse-ecj.jar.so
+mkdir tmp
+cp -a %{SOURCE2} tmp/eclipse-ecj.jar
+# close your eyes...
+RPM_BUILD_ROOT=tmp ./aot-compile-rpm
+mv tmp/eclipse-ecj.jar tmp/usr/lib/gcj/%{name}/* .
+# (you can open them again now)
gcj $RPM_OPT_FLAGS \
--main=org.eclipse.jdt.internal.compiler.batch.Main \
-Wl,-R,%{_libdir}/gcj/%{name} \
More information about the fedora-cvs-commits
mailing list