SPECS: ocaml.spec - CFLAGS fixes (5 sed invokations replaced with ...

[twittner]

Author: twittner                     Date: Fri Nov  4 21:03:21 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- CFLAGS fixes (5 sed invokations replaced with patch)

---- Files affected:
SPECS:
   ocaml.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: SPECS/ocaml.spec
diff -u SPECS/ocaml.spec:1.101 SPECS/ocaml.spec:1.102
--- SPECS/ocaml.spec:1.101	Tue Oct 11 12:14:43 2005
+++ SPECS/ocaml.spec	Fri Nov  4 22:03:15 2005
@@ -47,6 +47,7 @@
 # needs update for ocaml 3.08
 #Patch3:		%{name}-unused-var-warning.patch
 Patch4:		%{name}-tk85support.patch
+Patch5:		%{name}-CFLAGS.patch
 URL:		http://caml.inria.fr/
 %{?with_x:BuildRequires:	XFree86-devel}
 %{?with_db3:BuildRequires:	db3-devel}
@@ -327,14 +328,7 @@
 %patch2 -p1
 #%patch3 -p1
 %patch4 -p1
-
-# allow pass CFLAGS, replace -O, -pg,-DPROFILING with $(CFAGS)
-Makefiles=$(find . -type f -name Makefile\*)
-%{__sed} -i -e 's@^CFLAGS[ \t]*=@override CFLAGS += @' $Makefiles
-%{__sed} -i -e 's@\(^override CFLAGS += .*\)-O \(.*\)@\1\2@' $Makefiles
-%{__sed} -i -e 's@^CCFLAGS[ \t]*=\(.*\)@override CCFLAGS += \1 $(CFLAGS)@' $Makefiles
-%{__sed} -i -e 's at -pg -O -DPROFILING@ $(CFLAGS) @' asmrun/Makefile
-%{__sed} -i -e 's at -O@$(CFLAGS)@' otherlibs/systhreads/Makefile
+%patch5 -p1
 
 %build 
 cp -f /usr/share/automake/config.sub config/gnu
@@ -544,6 +538,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2005/11/04 21:03:15  twittner
+- CFLAGS fixes (5 sed invokations replaced with patch)
+
 Revision 1.101  2005/10/11 10:14:43  paszczus
 - -j1 only in one case
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ocaml.spec?r1=1.101&r2=1.102&f=u