- stlport doesn't require libstdc++ runtime.

[packages/STLport.git] / STLport.spec

diff --git a/STLport.spec b/STLport.spec
index 66d709b253221bb27a357682a6d7564ea67b5d43..a9f2530d2750f304dc1738f7ef9271084efb1aef 100644 (file)
--- a/STLport.spec
+++ b/STLport.spec
@@ -1,20 +1,24 @@
+#
+# 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.4
-Release:       3
+Version:       5.1.5
+Release:       2
 Epoch:         2
 License:       distributable (see README.gz)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5: b8d1cba9fd823e1edbfd83b4bbcb237d
+# Source0-md5: e31d0dc9141c4f264d887754b559cc84
 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 +58,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 +95,16 @@ Statyczna wersja diagnostyczna biblioteki STLport.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
 %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 +112,8 @@ sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
        CC="%{__cc}" \
        CXX="%{__cxx}"
 
+cd ../..
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}