OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Mar-2005 17:19:07
Branch: HEAD Handle: 2005030416190700
Modified files:
openpkg-src/stlport stlport.spec
Log:
abstract debug logic to a build option, improve description, and
simplify build commands
Summary:
Revision Changes Path
1.2 +21 -13 openpkg-src/stlport/stlport.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/stlport/stlport.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 stlport.spec
--- openpkg-src/stlport/stlport.spec 3 Mar 2005 20:33:38 -0000 1.1
+++ openpkg-src/stlport/stlport.spec 4 Mar 2005 16:19:07 -0000 1.2
@@ -34,7 +34,10 @@
Group: Language
License: STLport
Version: 5.0RC2
-Release: 20050303
+Release: 20050304
+
+# package options
+%option with_debug yes
# list of sources
Source0: http://www.stlport.org/archive/STLport-%{version}.tar.gz
@@ -48,14 +51,14 @@
AutoReqProv: no
%description
- STLport reimplements the classic SGI Standard Template Library,
- introducing features like Debug mode and Safe STL. Importantly,
- STLport is highly portable while adhering to standards and
+ STLport is a reimplementation of the classic SGI Standard Template
+ Library, introducing unique features like Debug mode and Safe STL.
+ It offers higher portability while complying with standards and
retaining full functionality.
- The Standard Template Library itself is a C++ library of
- container classes, algorithms, and iterators providing many of
- the basic algorithms and data structures of computer science.
+ The Standard Template Library is a C++ library of container classes,
+ algorithms, and iterators providing many of the basic algorithms and
+ data structures of computer science.
%track
prog stlport = {
@@ -74,21 +77,26 @@
src/num_put_float.cpp
%build
- cd build/lib && %{l_make} %{l_mflags} -f gcc.mak \
- INSTALLDIR="%{l_prefix}" \
- clean depend all-static
+ buildtargets="release-static"
+%if "%{with_debug}" == "yes"
+ buildtargets="$buildtargets dbg-static stldbg-static"
+%endif
+ cd build/lib && %{l_make} %{l_mflags} -f gcc.mak $buildtargets
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/include
( cd build/lib
- %{l_make} %{l_mflags} -f gcc.mak \
+ installtargets="install-release-static"
+%if "%{with_debug}" == "yes"
+ installtargets="$installtargets install-dbg-static
install-stldbg-static"
+%endif
+ %{l_make} %{l_mflags} -f gcc.mak $installtargets \
INSTALL="%{l_shtool} install -c" \
INSTALL_LIB_DIR="$RPM_BUILD_ROOT%{l_prefix}/lib" \
INSTALL_LIB_DIR_DBG="$RPM_BUILD_ROOT%{l_prefix}/lib" \
- INSTALL_LIB_DIR_STLDBG="$RPM_BUILD_ROOT%{l_prefix}/lib" \
- install-release-static install-dbg-static install-stldbg-static
+ INSTALL_LIB_DIR_STLDBG="$RPM_BUILD_ROOT%{l_prefix}/lib"
) || exit $?
rm -rf stlport/BC50 stlport/config/new_compiler
%{l_tar} cf - stlport | (cd $RPM_BUILD_ROOT%{l_prefix}/include &&
%{l_tar} xf -) || exit $?
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
