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:17:56
Branch: HEAD Handle: 2005030416175600
Added files:
openpkg-src/boost boost.patch.nopython
Modified files:
openpkg-src/boost boost.patch boost.spec
Log:
finally clean up, abstract python patch code, improve description, and
remove redundant environment variables and conditional constructs
Summary:
Revision Changes Path
1.3 +0 -89 openpkg-src/boost/boost.patch
1.1 +89 -0 openpkg-src/boost/boost.patch.nopython
1.3 +29 -47 openpkg-src/boost/boost.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/boost/boost.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 boost.patch
--- openpkg-src/boost/boost.patch 3 Mar 2005 20:47:43 -0000 1.2
+++ openpkg-src/boost/boost.patch 4 Mar 2005 16:17:56 -0000 1.3
@@ -1,92 +1,3 @@
-Index: Jamfile
---- Jamfile.orig 2005-03-02 20:17:46 +0100
-+++ Jamfile 2005-03-02 20:26:47 +0100
-@@ -62,15 +62,6 @@
- --without-<library> Do not build, stage, or install the specified
- <library>. By default all libraries attempt to
build.
-
-- --with-python-root[=PYTHON_ROOT]
-- Build Boost.Python libraries with the Python
-- devel packages located at PYTHON_ROOT.
-- Default PYTHON_ROOT; C:\\tools\\python on Win32.
-- Default PYTHON_ROOT; /usr/local on Unix, Linux,
etc.
-- Default PYTHON_ROOT; /usr on Cygwin.
--
-- --with-pydebug Build Boost.Python libraries using the
-- Python debug runtime.
- " ;
- EXIT "" ;
- }
-@@ -122,17 +113,6 @@
- local include-locate = [ MATCH "^--includedir=(.*)" : $(ARGV) ] ;
- include-locate ?= $(boost-locate)/include ;
-
--# location of python
--local python-root = [ MATCH "^--with-python-root=(.*)" : $(ARGV) ] ;
--PYTHON_ROOT ?= $(python-root) ;
--
--# variant for pydebug build
--local with-debug-python ;
--if --with-pydebug in $(ARGV)
--{
-- with-debug-python = debug-python ;
--}
--
- # libraries to disable building, etc.
- local without-libraries = [ MATCH "^--without-(.*)" : $(ARGV) ] ;
-
-@@ -142,9 +122,6 @@
- {
- switch $(arg)
- {
-- case --with-python-root=* : local _ ;
-- case --with-pydebug : local _ ;
--
- case --with-* :
- with-libraries += [ MATCH "^--with-(.*)" : $(arg) ] ;
- }
-@@ -153,9 +130,6 @@
- #
- project-root ;
-
--# bring in the rules for python
--import python ;
--
- #
- local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(BOOST_VERSION) ] ;
- version-tag = $(version-tag:J="_") ;
-@@ -174,7 +148,6 @@
-
- local lib-build =
- debug release
-- [ cond $(with-debug-python) : debug-python ]
- [ cond $(NT) : <runtime-link>static/dynamic ]
- <threading>single/multi
- ;
-Index: status/Jamfile
---- status/Jamfile.orig 2005-03-02 20:28:44 +0100
-+++ status/Jamfile 2005-03-02 20:28:37 +0100
-@@ -38,7 +38,6 @@
- subinclude libs/numeric/ublas ; # test-suite numeric/uBLAS
- subinclude libs/optional/test ; # test-suite optional
- subinclude libs/program_options/test ; # test-suite program_options
--subinclude libs/python/test ; # test-suite python
- subinclude libs/random/test ; # test-suite random
- subinclude libs/range/test ; # test-suite range
- subinclude libs/regex/test ; # test-suite regex
-Index: Jamfile.v2
---- Jamfile.v2.orig 2005-03-02 20:30:05 +0100
-+++ Jamfile.v2 2005-03-02 20:30:32 +0100
-@@ -24,9 +24,6 @@
- build-project libs/regex/build ;
- build-project libs/signals/build ;
- build-project libs/graph/build ;
--
--# Comment this out if you don't have Python2.2 installed
--build-project libs/python/build ;
- build-project libs/thread/build ;
- build-project libs/filesystem/build ;
- build-project libs/program_options/build ;
Index: boost/config/platform/bsd.hpp
--- boost/config/platform/bsd.hpp.orig 2004-02-27 14:13:00 +0100
+++ boost/config/platform/bsd.hpp 2005-03-03 14:15:00 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/boost/boost.patch.nopython
============================================================================
$ cvs diff -u -r0 -r1.1 boost.patch.nopython
--- /dev/null 2005-03-04 17:15:06 +0100
+++ boost.patch.nopython 2005-03-04 17:17:56 +0100
@@ -0,0 +1,89 @@
+Index: Jamfile
+--- Jamfile.orig 2005-03-02 20:17:46 +0100
++++ Jamfile 2005-03-02 20:26:47 +0100
+@@ -62,15 +62,6 @@
+ --without-<library> Do not build, stage, or install the specified
+ <library>. By default all libraries attempt to
build.
+
+- --with-python-root[=PYTHON_ROOT]
+- Build Boost.Python libraries with the Python
+- devel packages located at PYTHON_ROOT.
+- Default PYTHON_ROOT; C:\\tools\\python on Win32.
+- Default PYTHON_ROOT; /usr/local on Unix, Linux,
etc.
+- Default PYTHON_ROOT; /usr on Cygwin.
+-
+- --with-pydebug Build Boost.Python libraries using the
+- Python debug runtime.
+ " ;
+ EXIT "" ;
+ }
+@@ -122,17 +113,6 @@
+ local include-locate = [ MATCH "^--includedir=(.*)" : $(ARGV) ] ;
+ include-locate ?= $(boost-locate)/include ;
+
+-# location of python
+-local python-root = [ MATCH "^--with-python-root=(.*)" : $(ARGV) ] ;
+-PYTHON_ROOT ?= $(python-root) ;
+-
+-# variant for pydebug build
+-local with-debug-python ;
+-if --with-pydebug in $(ARGV)
+-{
+- with-debug-python = debug-python ;
+-}
+-
+ # libraries to disable building, etc.
+ local without-libraries = [ MATCH "^--without-(.*)" : $(ARGV) ] ;
+
+@@ -142,9 +122,6 @@
+ {
+ switch $(arg)
+ {
+- case --with-python-root=* : local _ ;
+- case --with-pydebug : local _ ;
+-
+ case --with-* :
+ with-libraries += [ MATCH "^--with-(.*)" : $(arg) ] ;
+ }
+@@ -153,9 +130,6 @@
+ #
+ project-root ;
+
+-# bring in the rules for python
+-import python ;
+-
+ #
+ local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(BOOST_VERSION) ] ;
+ version-tag = $(version-tag:J="_") ;
+@@ -174,7 +148,6 @@
+
+ local lib-build =
+ debug release
+- [ cond $(with-debug-python) : debug-python ]
+ [ cond $(NT) : <runtime-link>static/dynamic ]
+ <threading>single/multi
+ ;
+Index: status/Jamfile
+--- status/Jamfile.orig 2005-03-02 20:28:44 +0100
++++ status/Jamfile 2005-03-02 20:28:37 +0100
+@@ -38,7 +38,6 @@
+ subinclude libs/numeric/ublas ; # test-suite numeric/uBLAS
+ subinclude libs/optional/test ; # test-suite optional
+ subinclude libs/program_options/test ; # test-suite program_options
+-subinclude libs/python/test ; # test-suite python
+ subinclude libs/random/test ; # test-suite random
+ subinclude libs/range/test ; # test-suite range
+ subinclude libs/regex/test ; # test-suite regex
+Index: Jamfile.v2
+--- Jamfile.v2.orig 2005-03-02 20:30:05 +0100
++++ Jamfile.v2 2005-03-02 20:30:32 +0100
+@@ -24,9 +24,6 @@
+ build-project libs/regex/build ;
+ build-project libs/signals/build ;
+ build-project libs/graph/build ;
+-
+-# Comment this out if you don't have Python2.2 installed
+-build-project libs/python/build ;
+ build-project libs/thread/build ;
+ build-project libs/filesystem/build ;
+ build-project libs/program_options/build ;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/boost/boost.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 boost.spec
--- openpkg-src/boost/boost.spec 3 Mar 2005 20:47:43 -0000 1.2
+++ openpkg-src/boost/boost.spec 4 Mar 2005 16:17:56 -0000 1.3
@@ -38,7 +38,7 @@
Group: Language
License: Boost Software License
Version: %{V_openpkg}
-Release: 20050303
+Release: 20050304
# package options
%option with_debug yes
@@ -49,6 +49,7 @@
# list of sources
Source0: http://osdn.dl.sourceforge.net/boost/boost_%{V_dist}.tar.bz2
Patch0: boost.patch
+Patch1: boost.patch.nopython
# build information
Prefix: %{l_prefix}
@@ -63,11 +64,16 @@
AutoReqProv: no
%description
- The boost collection provides peer reviewed portable C++ source
- libraries. The emphasis is on libraries which work well with the C++
- Standard Library. The libraries are intended to be widely useful, and
- are in regular use by thousands of programmers across a broad spectrum
- of applications.
+ Boost provides peer reviewed portable C++ source libraries, placing
+ emphasis on libraries which work well with the C++ Standard Library.
+ The libraries are intended to be widely useful, and are in regular
+ use by thousands of programmers across a broad spectrum of applications.
+
+ Aiming to provide missing functionality in current standards, Boost was
+ begun by members of the C++ Standards Committee Library Working Group.
+ Today, logic from a subset of the boost collection is under review by
+ the ISO C++ Standards Committee and considered for inclusion in its
+ future standards documents.
%track
prog boost = {
@@ -78,6 +84,7 @@
%prep
%setup -q -n boost_%{V_dist}
+ %patch -p0
# acommodate platforms missing wide character support
case "%{l_platform -t}" in
@@ -90,71 +97,46 @@
# acommodate python conditional stupid logic
%if "%{with_python}" == "yes"
+ :
%else
- %patch -p0
- rm -rf libs/python boost/python* tools/build/v1/python.jam
+ %patch -p0 -P 1
+ rm -rf \
+ libs/python \
+ boost/python* \
+ tools/build/v1/python.jam
%endif
%build
- # bootstrap bjam, the boost build system
+ # bootstrap bjam(1), the boost build system
( cd tools/build/jam_src
./build.sh gcc
) || exit $?
# create build subdirectory, prepare to build
- mkdir obj
ln -s tools/build/jam_src/bin.*/bjam bjam
+ mkdir obj
- # build all libraries, maybe with python bindings
-%if "%{with_debug}" == "yes"
- debugopts="debug release"
-%else
+ # configure build options for bjam(1) -sBUILD parameter
debugopts="release"
-%endif
-%if "%{with_optimize}" == "yes"
- optimizeopts="<optimization>speed <inlining>full"
-%else
optimizeopts="<optimization>off"
-%endif
-%if "%{with_threads}" == "yes"
- threadopts="<threading>single/multi"
-%else
threadopts="<threading>single"
-%endif
-%if "%{with_python}" == "yes"
- PYTHON_ROOT=%{l_prefix} PYTHON_VERSION= \
- ./bjam --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts
-d2 <runtime-link>static" stage
-%else
- ./bjam --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts -d2
<runtime-link>static" stage
-%endif
-
-%install
- rm -rf $RPM_BUILD_ROOT
-
- # install headers and libs the bjam way
%if "%{with_debug}" == "yes"
- debugopts="debug release"
-%else
- debugopts="release"
+ debugopts="$debugopts debug"
%endif
%if "%{with_optimize}" == "yes"
optimizeopts="<optimization>speed <inlining>full"
-%else
- optimizeopts="<optimization>off"
%endif
%if "%{with_threads}" == "yes"
threadopts="<threading>single/multi"
-%else
- threadopts="<threading>single"
%endif
-%if "%{with_python}" == "yes"
+
+ # build all libraries with python bindings if so configured
PYTHON_ROOT=%{l_prefix} PYTHON_VERSION= \
- ./bjam --prefix=$RPM_BUILD_ROOT%{l_prefix} -sBUILD="$debugopts
$optimizeopts $threadopts -d2 <runtime-link>static" install
-%else
- ./bjam --prefix=$RPM_BUILD_ROOT%{l_prefix} -sBUILD="$debugopts
$optimizeopts $threadopts -d2 <runtime-link>static" install
-%endif
+ ./bjam --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts"
stage
- # clean up stray version numbers, dynamic libs, and install bjam
+%install
+ rm -rf $RPM_BUILD_ROOT
+ ./bjam --prefix=$RPM_BUILD_ROOT%{l_prefix} install
mv $RPM_BUILD_ROOT%{l_prefix}/include/boost-*/boost
$RPM_BUILD_ROOT%{l_prefix}/include
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/boost-*
find $RPM_BUILD_ROOT%{l_prefix}/lib/ \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
