rpms/openoffice.org/devel openoffice.org-1.9.121.gcc17828.stlport.patch, NONE, 1.1 openoffice.org.spec, 1.352, 1.353

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13090

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.121.gcc17828.stlport.patch 
Log Message:
fpic test

openoffice.org-1.9.121.gcc17828.stlport.patch:
 STLport-4.5.patch |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-1.9.121.gcc17828.stlport.patch ---
Index: STLport-4.5.patch
===================================================================
RCS file: /cvs/external/stlport/STLport-4.5.patch,v
retrieving revision 1.23
diff -u -p -u -r1.23 STLport-4.5.patch
--- openoffice.org.orig/stlport/STLport-4.5.patch	13 May 2005 13:04:18 -0000	1.23
+++ openoffice.org/stlport/STLport-4.5.patch	25 Jul 2005 13:01:32 -0000
@@ -188,11 +188,11 @@
 ! 
 ! CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS}
 ! 
-! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fpic
+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fpic
 ! 
-! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fpic
+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fpic
 ! 
 ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
 ! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- openoffice.org.spec	25 Jul 2005 09:59:11 -0000	1.352
+++ openoffice.org.spec	25 Jul 2005 13:05:59 -0000	1.353
@@ -1,5 +1,5 @@
 %define ooo2ver 121
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
 %define build_fc4 0
 %define build_fc5 1
 
@@ -162,6 +162,7 @@
 Patch59: openoffice.org-1.9.118.forwarddecl.psprint.patch
 Patch60: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
 Patch61: openoffice.org-1.9.120.rh158977.execshield.bridges.patch
+Patch62: openoffice.org-1.9.121.gcc17828.stlport.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -808,6 +809,7 @@
 %patch59 -p1 -b .forwarddecl.psprint.patch
 # %patch60 -p1 -b .rhXXXXX.envcflags.solenv.patch
 %patch61 -p1 -b .rh158977.execshield.bridges.patch
+%patch62 -p1 -b .gcc17828.stlport.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -847,6 +849,8 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
+#force picswitch for gcc#17828#
+export PICSWITCH=-fpic
 #force linker
 export LINK=$CXX
 #faster build
@@ -3020,6 +3024,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Jul 25 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.121-2
+- ppc problem is likely gcc#17828#
+
 * Mon Jul 25 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.121-1
 - next version