SPECS: STLport.spec - pass optflags in a way which doesn't kill -f...

qboosh qboosh at pld-linux.org
Sat Nov 19 17:19:42 CET 2005


Author: qboosh                       Date: Sat Nov 19 16:19:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pass optflags in a way which doesn't kill -fPIC
- dropped nodebug,gcc34 patches

---- Files affected:
SPECS:
   STLport.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: SPECS/STLport.spec
diff -u SPECS/STLport.spec:1.54 SPECS/STLport.spec:1.55
--- SPECS/STLport.spec:1.54	Fri Nov 18 08:39:16 2005
+++ SPECS/STLport.spec	Sat Nov 19 17:19:37 2005
@@ -10,10 +10,9 @@
 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)
 
@@ -53,18 +52,15 @@
 %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
@@ -106,6 +102,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2005/11/19 16:19:37  qboosh
+- pass optflags in a way which doesn't kill -fPIC
+- dropped nodebug,gcc34 patches
+
 Revision 1.54  2005/11/18 07:39:16  qboosh
 - removed outdated soname,gcc3stdexcept,extra-cxxflags patches
 - pass CC,CFLAGS (used for one file)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/STLport.spec?r1=1.54&r2=1.55&f=u




More information about the pld-cvs-commit mailing list