- bug (infinite loop) fix.

[packages/STLport.git] / STLport.spec

diff --git a/STLport.spec b/STLport.spec
index 7e3cc4e11c7ab63afe9d34d9e1e38f9e3615b4e3..d690f60da3130f8694dfbce7458fe8b4fcb07e7f 100644 (file)
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,20 +1,27 @@
+#
+# Conditional build:
+%bcond_with    static_gcc      # linkg libgcc* statically into libstlport.
+#
 Summary:       C++ standard library
 Summary(pl.UTF-8):     Biblioteki standardowe C++
 Name:          STLport
 Version:       5.1.5
-Release:       1
+Release:       7
 Epoch:         2
 License:       distributable (see README.gz)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
 # Source0-md5: e31d0dc9141c4f264d887754b559cc84
+Source1:       stlport-config.in
+Source2:       stlport.pc.in
+Source3:       stlport-debug.pc.in
 Patch0:                %{name}-endianness.patch
 Patch1:                %{name}-alpha.patch
 Patch2:                %{name}-valarray-copy-constructor.patch
+Patch3:                %{name}-vendor_gcc_detection.patch
 URL:           http://stlport.sourceforge.net/
 BuildRequires: libstdc++-devel >= 6:4.2.0-1
 BuildRequires: sed >= 4.0
-%requires_eq   libstdc++
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -54,7 +61,6 @@ Biblioteki statyczne do STLport.
 Summary:       Debug version of STLport library
 Summary(pl.UTF-8):     Wersja diagnostyczna biblioteki STLport
 Group:         Libraries
-%requires_eq   libstdc++
 
 %description dbg
 Debug version of STLport library.
@@ -92,11 +98,20 @@ Statyczna wersja diagnostyczna biblioteki STLport.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
+cp -a %{SOURCE1} stlport-config.in
+cp -a %{SOURCE2} stlport.pc.in
+cp -a %{SOURCE3} stlport-debug.pc.in
+
 %build
-%{__make} -C build/lib -f gcc.mak \
+cd build/lib
+
+%{?with_static_gcc:./configure --use-static-gcc}
+
+%{__make} -f gcc.mak \
        stldbg-shared \
        stldbg-static \
        release-shared \
@@ -104,6 +119,21 @@ sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
        CC="%{__cc}" \
        CXX="%{__cxx}"
 
+cd ../..
+
+subst='
+       s,@prefix@,%{_prefix},g
+       s,@exec_prefix@,%{_exec_prefix},g
+       s,@libdir@,%{_libdir},g
+       s,@includedir@,%{_includedir},g
+       s,@ver@,%{version},g
+       s,@VERSION@,%{version},g
+'
+
+%{__sed} -e "$subst" stlport-config.in > stlport-config
+%{__sed} -e "$subst" stlport.pc.in > stlport.pc
+%{__sed} -e "$subst" stlport-debug.pc.in > stlport-debug.pc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}
@@ -126,6 +156,12 @@ ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlport.so.*.*.*) \
 ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlportstlg.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libstlportstlg.so
 
+
+install -d $RPM_BUILD_ROOT{%{_pkgconfigdir},%{_bindir}}
+cp -a stlport.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+cp -a stlport-debug.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+install stlport-config $RPM_BUILD_ROOT%{_bindir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -140,12 +176,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %attr(755,root,root) %{_libdir}/libstlport.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libstlport.so.5.1
+%attr(755,root,root) %ghost %{_libdir}/libstlport.so.5
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{FAQ,*.txt}
 %attr(755,root,root) %{_libdir}/libstlport.so
+%attr(755,root,root) %{_bindir}/stlport-config
 %{_includedir}/stlport
+%{_pkgconfigdir}/stlport.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -155,10 +194,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libstlportstlg.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libstlportstlg.so.5.1
+%attr(755,root,root) %ghost %{_libdir}/libstlportstlg.so.5
 
 %files dbg-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libstlportstlg.so
+%{_pkgconfigdir}/stlport-debug.pc
 
 %files dbg-static
 %defattr(644,root,root,755)