- added -j1 to make install, fixes build on ti-i686 and ti-x86_64

[packages/STLport.git] / STLport.spec

diff --git a/STLport.spec b/STLport.spec
index d690f60da3130f8694dfbce7458fe8b4fcb07e7f..6e8a72197d704e39ae5ad4d87b8f80be05c2ad7b 100644 (file)
--- a/STLport.spec
+++ b/STLport.spec
@@ -5,20 +5,18 @@
 Summary:       C++ standard library
 Summary(pl.UTF-8):     Biblioteki standardowe C++
 Name:          STLport
-Version:       5.1.5
-Release:       7
+Version:       5.2.1
+Release:       2
 Epoch:         2
 License:       distributable (see README.gz)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
-# Source0-md5: e31d0dc9141c4f264d887754b559cc84
+# Source0-md5: a8341363e44d9d06a60e03215b38ddde
 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
@@ -97,8 +95,6 @@ Statyczna wersja diagnostyczna biblioteki STLport.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 sed -i -e 's/= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
@@ -107,19 +103,18 @@ cp -a %{SOURCE2} stlport.pc.in
 cp -a %{SOURCE3} stlport-debug.pc.in
 
 %build
-cd build/lib
-
-%{?with_static_gcc:./configure --use-static-gcc}
-
-%{__make} -f gcc.mak \
-       stldbg-shared \
-       stldbg-static \
-       release-shared \
-       release-static \
-       CC="%{__cc}" \
-       CXX="%{__cxx}"
-
-cd ../..
+./configure \
+       --prefix=%{_prefix} \
+       --includedir=%{_includedir} \
+       --libdir=%{_libdir} \
+       --with-cc=%{__cc} \
+       --with-cxx=%{__cxx} \
+       --without-debug \
+       --enable-static \
+       %{?with_static_gcc:--use-static-gcc} \
+       --use-compiler-family=gcc
+
+%{__make}
 
 subst='
        s,@prefix@,%{_prefix},g
@@ -138,17 +133,9 @@ subst='
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}
 
-%{__make} -C build/lib -f gcc.mak \
-       install-stldbg-shared \
-       install-stldbg-static \
-       install-release-shared \
-       install-release-static \
-       INSTALL_BIN_DIR=$RPM_BUILD_ROOT%{_bindir} \
-       INSTALL_LIB_DIR_STLDBG=$RPM_BUILD_ROOT%{_libdir} \
-       INSTALL_LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-
-cp -a stlport $RPM_BUILD_ROOT%{_includedir}
-rm -rf $RPM_BUILD_ROOT%{_includedir}/stlport/BC50
+%{__make} -j1 install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       INSTALL_LIB_DIR_STLDBG=$RPM_BUILD_ROOT%{_libdir}
 
 # let libstlport{,stlg}.so point to real lib, not artificial libstlport{,stlg}.so.5 symlink
 ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libstlport.so.*.*.*) \
@@ -156,7 +143,6 @@ 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}
@@ -175,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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.2
 %attr(755,root,root) %ghost %{_libdir}/libstlport.so.5
 
 %files devel
@@ -193,7 +179,7 @@ rm -rf $RPM_BUILD_ROOT
 %files dbg
 %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.2
 %attr(755,root,root) %ghost %{_libdir}/libstlportstlg.so.5
 
 %files dbg-devel