rpms/fribidi/EL-6 fribidi.spec,1.31,1.32

Michel Alexandre Salim salimma at fedoraproject.org
Thu Jul 8 11:24:59 UTC 2010


Author: salimma

Update of /cvs/pkgs/rpms/fribidi/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22209/EL-6

Modified Files:
	fribidi.spec 
Log Message:
Adjust CFLAGS for compiling fribidi on EL-5



Index: fribidi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fribidi/EL-6/fribidi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- fribidi.spec	24 Jul 2009 23:13:00 -0000	1.31
+++ fribidi.spec	8 Jul 2010 11:24:59 -0000	1.32
@@ -28,9 +28,18 @@ FriBidi.
 %setup -q
 
 %build
+%if 0%{?el5}
+# FORTIFY_SOURCE=2 breaks EL-5 build
+export CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|'`
+%ifarch ppc ppc64 x86_64
+export CFLAGS="$CFLAGS -DPAGE_SIZE=4096"
+%endif
+%else
+# outside of EL-5, only ppc* needs modification
 %ifarch ppc ppc64
 export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %endif
+%endif
 %configure --disable-static
 make %{?_smp_mflags}
 



More information about the scm-commits mailing list