Selaa lähdekoodia

cleanup packaging somewhat although it still doesn't build for me correctly

Ralf S. Engelschall 20 vuotta sitten
vanhempi
commit
c33ba6eae4
3 muutettua tiedostoa jossa 99 lisäystä ja 112 poistoa
  1. 76 0
      boost/boost.patch
  2. 0 76
      boost/boost.patch.nopython
  3. 23 36
      boost/boost.spec

+ 76 - 0
boost/boost.patch

@@ -12,3 +12,79 @@ Index: tools/build/v1/boost-base.jam
      
      if $(tags)
      {
+Index: Jamfile
+--- Jamfile.orig	2005-02-27 18:28:08 +0100
++++ Jamfile	2005-08-13 14:34:09 +0200
+@@ -64,15 +64,6 @@
+                             <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 "" ;
+ }
+@@ -124,17 +115,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) ] ;
+ 
+@@ -144,9 +124,6 @@
+ {
+     switch $(arg)
+     {
+-        case --with-python-root=* : local _ ;
+-        case --with-pydebug : local _ ;
+-        
+         case --with-* :
+         with-libraries += [ MATCH "^--with-(.*)" : $(arg) ] ;
+     }
+@@ -155,9 +132,6 @@
+ #
+ project-root ;
+ 
+-# bring in the rules for python
+-import python ;
+-
+ #
+ local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(BOOST_VERSION) ] ;
+ version-tag = $(version-tag:J="_") ;
+@@ -176,7 +150,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-06-23 11:57:18 +0200
++++ status/Jamfile	2005-08-13 14:35:31 +0200
+@@ -44,7 +44,6 @@
+ subinclude libs/program_options/test ;     # test-suite program_options
+ subinclude libs/property_map/test ;        # test-suite property_map
+ subinclude libs/ptr_container/test ;       # test-suite ptr_container
+-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

+ 0 - 76
boost/boost.patch.nopython

@@ -1,76 +0,0 @@
-Index: Jamfile
---- Jamfile.orig	2005-02-27 18:28:08 +0100
-+++ Jamfile	2005-08-13 14:34:09 +0200
-@@ -64,15 +64,6 @@
-                             <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 "" ;
- }
-@@ -124,17 +115,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) ] ;
- 
-@@ -144,9 +124,6 @@
- {
-     switch $(arg)
-     {
--        case --with-python-root=* : local _ ;
--        case --with-pydebug : local _ ;
--        
-         case --with-* :
-         with-libraries += [ MATCH "^--with-(.*)" : $(arg) ] ;
-     }
-@@ -155,9 +132,6 @@
- #
- project-root ;
- 
--# bring in the rules for python
--import python ;
--
- #
- local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(BOOST_VERSION) ] ;
- version-tag = $(version-tag:J="_") ;
-@@ -176,7 +150,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-06-23 11:57:18 +0200
-+++ status/Jamfile	2005-08-13 14:35:31 +0200
-@@ -44,7 +44,6 @@
- subinclude libs/program_options/test ;     # test-suite program_options
- subinclude libs/property_map/test ;        # test-suite property_map
- subinclude libs/ptr_container/test ;       # test-suite ptr_container
--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

+ 23 - 36
boost/boost.spec

@@ -28,51 +28,46 @@
 
 #   package information
 Name:         boost
-Summary:      Peer Reviewed Portable C++ Libraries
+Summary:      Peer-Reviewed Portable C++ Libraries
 URL:          http://www.boost.org/
-Vendor:       Boost community
+Vendor:       Boost Community
 Packager:     OpenPKG
 Distribution: OpenPKG
 Class:        EVAL
 Group:        Language
 License:      Boost Software License
 Version:      %{V_openpkg}
-Release:      20050823
+Release:      20051006
 
 #   package options
 %option       with_debug     yes
 %option       with_optimize  yes
 %option       with_threads   yes
-%option       with_python    no
 
 #   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}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc
-PreReq:       OpenPKG, openpkg >= 20040130, gcc
-%if "%{with_python}" == "yes"
-BuildPreReq:  python
-PreReq:       python
-%endif
+PreReq:       OpenPKG, openpkg >= 20040130
 AutoReq:      no
 AutoReqProv:  no
 
 %description
-    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.
+    Boost provides peer-reviewed portable C++ class 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 = {
@@ -84,27 +79,20 @@ AutoReqProv:  no
 %prep
     %setup -q -n boost_%{V_dist}
     %patch -p0
+    rm -rf \
+        libs/python \
+        boost/python* \
+        tools/build/v1/python.jam
 
-    #   acommodate platforms missing wide character support
+    #   accommodate platforms missing wide character support
     case "%{l_platform -t}" in
-        *-freebsd* )
+        *-freebsd4* )
             %{l_shtool} subst \
                 -e 's;.*<lib>boost_wserialization.*;;' \
                 libs/serialization/build/Jamfile
             ;;
     esac
 
-    #   acommodate python conditional stupid logic
-%if "%{with_python}" == "yes"
-    :
-%else
-    %patch -p0 -P 1
-    rm -rf \
-        libs/python \
-        boost/python* \
-        tools/build/v1/python.jam
-%endif
-
 %build
     #   bootstrap bjam(1), the boost build system
     ( cd tools/build/jam_src
@@ -129,9 +117,8 @@ AutoReqProv:  no
     threadopts="<threading>single/multi"
 %endif
 
-    #   build all libraries with python bindings if so configured
-    PYTHON_ROOT=%{l_prefix} PYTHON_VERSION= \
-        ./bjam --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts" stage
+    #   build all libraries
+    ./bjam --builddir=obj -sBUILD="$debugopts $optimizeopts $threadopts" stage
 
 %install
     rm -rf $RPM_BUILD_ROOT