OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Jun-2007 23:28:30
Branch: HEAD Handle: 2007061822283000
Modified files:
openpkg-src/boost boost.spec
Log:
make compression optional and make sure the OpenPKG headers and
libraries are picked up
Summary:
Revision Changes Path
1.14 +37 -5 openpkg-src/boost/boost.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/boost/boost.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 boost.spec
--- openpkg-src/boost/boost.spec 17 Jun 2007 19:18:32 -0000 1.13
+++ openpkg-src/boost/boost.spec 18 Jun 2007 21:28:30 -0000 1.14
@@ -37,12 +37,14 @@
Group: Language
License: Boost Software License
Version: %{V_openpkg}
-Release: 20070617
+Release: 20070618
# package options
%option with_debug yes
%option with_optimize yes
%option with_threads yes
+%option with_zlib yes
+%option with_bzip2 yes
# list of sources
Source0: http://switch.dl.sourceforge.net/boost/boost_%{V_dist}.tar.bz2
@@ -53,6 +55,14 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc
PreReq: OpenPKG, openpkg >= 20040130
+%if "%{with_zlib}" == "yes"
+BuildPreReq: zlib
+PreReq: zlib
+%endif
+%if "%{with_bzip2}" == "yes"
+BuildPreReq: bzip2
+PreReq: bzip2
+%endif
AutoReq: no
AutoReqProv: no
@@ -91,8 +101,8 @@
) || exit $?
# create build subdirectory, prepare to build
- ln -s tools/jam/src/bin.*/bjam bjam
- mkdir obj
+ ln -sf tools/jam/src/bin.*/bjam bjam
+ %{l_shtool} mkdir -p obj
# configure build options for bjam(1) -sBUILD parameter
debugopts="release"
@@ -109,11 +119,33 @@
%endif
# build all libraries
- ./bjam --toolset=gcc --layout=system --builddir=obj -sBUILD="$debugopts
$optimizeopts $threadopts" stage
+ ./bjam --toolset=gcc --layout=system --builddir=obj "-sBUILD=$debugopts
$optimizeopts $threadopts" \
+%if "%{with_zlib}" == "yes"
+ "-sNO_COMPRESSION=0" "-sZLIB_INCLUDE=%{l_prefix}/include"
"-sZLIB_LIBPATH=%{l_prefix}/lib" \
+%else
+ "-sNOZLIB=1" \
+%endif
+%if "%{with_bzip2}" == "yes"
+ "-sNO_COMPRESSION=0" "-sBZIP2_INCLUDE=%{l_prefix}/include"
"-sBZIP2_LIBPATH=%{l_prefix}/lib" \
+%else
+ "-sNOBZIP2=1" \
+%endif
+ stage
%install
rm -rf $RPM_BUILD_ROOT
- ./bjam --toolset=gcc --layout=system --prefix=$RPM_BUILD_ROOT%{l_prefix}
install
+ ./bjam --toolset=gcc --layout=system --prefix=$RPM_BUILD_ROOT%{l_prefix}
\
+%if "%{with_zlib}" == "yes"
+ "-sNO_COMPRESSION=0" "-sZLIB_INCLUDE=%{l_prefix}/include"
"-sZLIB_LIBPATH=%{l_prefix}/lib" \
+%else
+ "-sNOZLIB=1" \
+%endif
+%if "%{with_bzip2}" == "yes"
+ "-sNO_COMPRESSION=0" "-sBZIP2_INCLUDE=%{l_prefix}/include"
"-sBZIP2_LIBPATH=%{l_prefix}/lib" \
+%else
+ "-sNOBZIP2=1" \
+%endif
+ install
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/boost-*
find $RPM_BUILD_ROOT%{l_prefix}/lib/ \
-name "*.so" -print -o \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
