Author: pluto                        Date: Wed Apr  9 14:16:15 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- gomp/mudflap bconded.

---- Files affected:
SPECS:
   gcc.spec (1.530 -> 1.531) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.530 SPECS/gcc.spec:1.531
--- SPECS/gcc.spec:1.530        Tue Apr  8 23:22:19 2008
+++ SPECS/gcc.spec      Wed Apr  9 16:16:10 2008
@@ -9,7 +9,9 @@
 %bcond_without ada             # build without ADA support
 %bcond_without cxx             # build without C++ support
 %bcond_without fortran         # build without Fortran support
+%bcond_without gomp            # build without OpenMP support
 %bcond_without java            # build without Java support
+%bcond_without mudflap         # build without Mudflap pointer debugging 
support
 %bcond_without objc            # build without Objective-C support
 %bcond_without objcxx          # build without Objective-C++ support
 %bcond_without alsa            # don't build libgcj ALSA MIDI interface
@@ -1350,6 +1352,8 @@
        --enable-threads=posix \
        --enable-linux-futex \
        
--enable-languages="c%{?with_cxx:,c++}%{?with_fortran:,fortran}%{?with_objc:,objc}%{?with_objcxx:,obj-c++}%{?with_ada:,ada}%{?with_java:,java}"
 \
+       --%{?with_gomp:en}%{!?with_gomp:dis}able-libgomp \
+       --%{?with_mudflap:en}%{!?with_mudflap:dis}able-libmudflap \
        --enable-c99 \
        --enable-long-long \
        --%{?with_multilib:en}%{!?with_multilib:dis}able-multilib \
@@ -1505,9 +1509,11 @@
 
 # avoid -L poisoning in *.la - there should be only 
-L%{_libdir}/gcc/*/%{version}
 # normalize libdir, to avoid propagation of unnecessary RPATHs by libtool
-for f in libgomp.la libmudflap.la libmudflapth.la libssp.la 
libssp_nonshared.la \
+for f in libssp.la libssp_nonshared.la \
        %{?with_cxx:libstdc++.la libsupc++.la} \
        %{?with_fortran:libgfortran.la} \
+       %{?with_gomp:libgomp.la} \
+       %{?with_mudflap:libmudflap.la libmudflapth.la} \
 %if %{with java}
        libffi.la libgcj.la libgcj-tools.la libgij.la \
        %{gcjdbexecdir}/libjvm.la \
@@ -1524,9 +1530,11 @@
        mv $RPM_BUILD_ROOT%{_libdir}/$f{.fixed,}
 done
 %if %{with multilib}
-for f in libgomp.la libmudflap.la libmudflapth.la libssp.la 
libssp_nonshared.la \
+for f in libssp.la libssp_nonshared.la \
        %{?with_cxx:libstdc++.la libsupc++.la} \
        %{?with_fortran:libgfortran.la} \
+       %{?with_gomp:libgomp.la} \
+       %{?with_mudflap:libmudflap.la libmudflapth.la} \
        %{?with_java:libffi.la} \
        %{?with_objc:libobjc.la};
 do
@@ -1656,7 +1664,7 @@
 %{_libdir}/gcc/*/*/include/float.h
 %{_libdir}/gcc/*/*/include/iso646.h
 %{_libdir}/gcc/*/*/include/limits.h
-%{_libdir}/gcc/*/*/include/omp.h
+%{?with_gomp:%{_libdir}/gcc/*/*/include/omp.h}
 %{_libdir}/gcc/*/*/include/stdarg.h
 %{_libdir}/gcc/*/*/include/stdbool.h
 %{_libdir}/gcc/*/*/include/stddef.h
@@ -1716,6 +1724,7 @@
 %attr(755,root,root) %{_slibdir32}/lib*.so.*
 %endif
 
+%if %{with gomp}
 %files -n libgomp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgomp.so.*.*.*
@@ -1751,7 +1760,9 @@
 %defattr(644,root,root,755)
 %{_libdir32}/libgomp.a
 %endif
+%endif
 
+%if %{with mudflap}
 %files -n libmudflap
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmudflap*.so.*.*.*
@@ -1784,6 +1795,7 @@
 %defattr(644,root,root,755)
 %{_libdir32}/libmudflap*.a
 %endif
+%endif
 
 %if %{with ada}
 %files ada
@@ -2125,6 +2137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.531  2008-04-09 14:16:10  pluto
+- gomp/mudflap bconded.
+
 Revision 1.530  2008-04-08 21:22:19  pluto
 - s/branch.diff/branch.diff.bz2/
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gcc.spec?r1=1.530&r2=1.531&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to