- pass optflags in a way which doesn't kill -fPIC

- dropped nodebug,gcc34 patches

Changed files:
    STLport.spec -> 1.55

diff --git a/STLport.spec b/STLport.spec
index 2c15b235f743f0ee04b0858c7543bcdab2c67df8..8ba046ce5897ab39883abe0ce242cf8f74c250f3 100644 (file)
--- a/STLport.spec
+++ b/STLport.spec
@@ -9,10 +9,9 @@ Group:         Libraries
 Source0:       http://dl.sourceforge.net/stlport/%{name}-%{version}.tar.bz2
 # Source0-md5: 5aefcbb0c30a91d50bb2d6c7b30e8393
 Patch0:                %{name}-endianness.patch
-Patch1:                %{name}-nodebug.patch
-Patch2:                %{name}-gcc34.patch
 URL:           http://stlport.sourceforge.net/
 BuildRequires: libstdc++-devel >= 5:3.3.2
+BuildRequires: sed >= 4.0
 %requires_eq   libstdc++
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,18 +51,15 @@ Biblioteki statyczne do STLport.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-#patch1 -p1
-#patch2 -p1
+
+sed -i -e 's/^= -O2$/= %{rpmcflags}/' build/Makefiles/gmake/gcc.mak
 
 %build
-# XXX: -fPIC is lost somewhere
 %{__make} -C build/lib -f gcc.mak \
        release-shared \
        release-static \
        CC="%{__cc}" \
-       CXX="%{__cxx}" \
-       CFLAGS="%{rpmcflags}" \
-       CXXFLAGS="%{rpmcxxflags}"
+       CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT