rpms/jacorb/devel jacorb.spec,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jacorb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27360

Modified Files:
	jacorb.spec 
Log Message:
Work around PPC limit (#158308)


Index: jacorb.spec
===================================================================
RCS file: /cvs/dist/rpms/jacorb/devel/jacorb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jacorb.spec	27 Jun 2005 15:11:14 -0000	1.6
+++ jacorb.spec	27 Jun 2005 17:16:21 -0000	1.7
@@ -108,10 +108,22 @@
 ant -Dbuild.sysclasspath=first all doc
 
 gcj-dbtool -n lib/%{name}-%{version}.db 8192
-aot-compile \
-    lib/%{name}.jar \
-    lib/lib%{name}-%{version}.jar.so \
-    "$RPM_OPT_FLAGS -fPIC"
+# Can't use aot-compile or we hit #158308
+mkdir -p lib/tmp/{1,2}
+pushd lib/tmp
+(cd 1 && jar xf ../../%{name}.jar)
+mkdir -p 2/org/{jacorb,omg}
+mv 1/org/omg/{CORBA,CosCollection,CosTrading} 2/org/omg
+mv 1/org/omg/{CosNotifyChannelAdmin,Security} 2/org/omg
+mv 1/org/jacorb/{notification,orb} 2/org/jacorb
+flags="$RPM_OPT_FLAGS -fPIC -findirect-dispatch"
+for i in 1 2; do
+    (cd $i && jar cfM ../$i.jar org)
+    gcj -c $flags $i.jar -o $i.o 
+done
+gcj -shared $flags -Wl,-Bsymbolic *.o -o ../lib%{name}-%{version}.jar.so
+popd
+# (end of #158308 workaround)
 gcj-dbtool -f \
     lib/%{name}-%{version}.db \
     lib/%{name}.jar \