- CFLAGS fixes (5 sed invokations replaced with patch)

[packages/ocaml.git] / ocaml.spec

diff --git a/ocaml.spec b/ocaml.spec
index c2dc99370425d4ff5e3198c052802ba7b76b22c4..9a6e5449e1aeff5fd32108b6ce16aef0ae577fbf 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -46,6 +46,7 @@ Patch2:               %{name}-objinfo.patch
 # 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}
@@ -326,14 +327,7 @@ cp %{SOURCE6} docs/camlp4-tutorial.ps.gz
 %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@-pg -O -DPROFILING@ $(CFLAGS) @' asmrun/Makefile
-%{__sed} -i -e 's@-O@$(CFLAGS)@' otherlibs/systhreads/Makefile
+%patch5 -p1
 
 %build 
 cp -f /usr/share/automake/config.sub config/gnu
@@ -348,13 +342,13 @@ cp -f /usr/share/automake/config.sub config/gnu
        -x11lib /usr/X11R6/%{_lib}
 
 %{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall"
-%{__make} -j1 -C tools objinfo CFLAGS="%{rpmcflags} -Wall" -j1
+%{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}}
 
-%{__make} -j1 install \
+%{__make} install \
        BINDIR=$RPM_BUILD_ROOT%{_bindir} \
        LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} \
        MANDIR=$RPM_BUILD_ROOT%{_mandir}
@@ -365,7 +359,7 @@ cat > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf <<EOF
 EOF
 
 %if %{with emacs}
-%{__make} -j1 -C emacs DESTDIR=$RPM_BUILD_ROOT install \
+%{__make} -C emacs DESTDIR=$RPM_BUILD_ROOT install \
        EMACS="`if [ -x %{_bindir}/emacs ]; then echo emacs; \
                else echo xemacs; fi`" \
        EMACSDIR="$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp"