Thu Aug 2 05:48:38 UTC 2007

Author: bkoz

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25867/devel

Modified Files:
	.cvsignore boost.spec sources 
Added Files:
	boost-configure.patch boost-gcc-soname.patch 
	boost-run-tests.patch boost-use-rpm-optflags.patch 
Removed Files:
	boost-base.patch boost-bind-gcc41.patch 
	boost-config-compiler-gcc.patch boost-cxxflags-debug.patch 
	boost-gcc-tools.patch boost-python-vs-x86-64.patch 
	boost-runtests.patch boost-serialization-warnings.patch 
	boost-spirit-warnings.patch boost-thread.patch 
Log Message:

* Tue Jul 31 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1-1
- Update to boost_1_34_1.
- Source via http.
- Philipp Thomas <pth.suse.de> fix for RPM_OPT_FLAGS
- Philipp Thomas <pth.suse.de> fix for .so sym links.
- (#225622) Patrice Dumas review comments. 



boost-configure.patch:

--- NEW FILE boost-configure.patch ---
*** configure.orig	2007-01-16 01:39:00.000000000 +0100
--- configure	2007-01-19 03:53:08.000000000 +0100
***************
*** 9,15 ****
  
  BJAM=""
  TOOLSET=""
! BJAM_CONFIG=""
  BUILD=""
  PREFIX=/usr/local
  EPREFIX=
--- 9,15 ----
  
  BJAM=""
  TOOLSET=""
! BJAM_CONFIG="-d2 --layout=system variant=release debug-symbols=on"
  BUILD=""
  PREFIX=/usr/local
  EPREFIX=
*************** INCLUDEDIR=$INCLUDEDIR
*** 325,332 ****
  LIBS=$LIBS
  
  all: .dummy
! 	@echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS)"
! 	@\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) || \\
  	echo "Not all Boost libraries built properly."
  
  clean: .dummy
--- 325,332 ----
  LIBS=$LIBS
  
  all: .dummy
! 	@echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage"
! 	@\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage || \\
  	echo "Not all Boost libraries built properly."
  
  clean: .dummy

boost-gcc-soname.patch:

--- NEW FILE boost-gcc-soname.patch ---
*** tools/build/v2/tools/gcc.jam.orig	2007-05-03 08:09:04.000000000 +0200
--- tools/build/v2/tools/gcc.jam	2007-06-26 20:37:44.000000000 +0200
*************** if [ os.name ] != NT && [ os.name ] != O
*** 316,322 ****
      # expected, therefore it has been disabled.
  
      HAVE_SONAME   = "" ;
!     SONAME_OPTION = -h ;
  }
  
  
--- 316,323 ----
      # expected, therefore it has been disabled.
  
      HAVE_SONAME   = "" ;
!     SONAME_OPTION = -soname ;
!     SONAME_VERSION = 2 ;
  }
  
  
*************** rule link.dll ( targets * : sources * : 
*** 631,637 ****
  # Differ from 'link' above only by -shared.
  actions link.dll bind LIBRARIES
  {
!     "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
  }
  
  # Set up threading support. It's somewhat contrived, so perform it at the end,
--- 632,638 ----
  # Differ from 'link' above only by -shared.
  actions link.dll bind LIBRARIES
  {
!     "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
  }
  
  # Set up threading support. It's somewhat contrived, so perform it at the end,

boost-run-tests.patch:

--- NEW FILE boost-run-tests.patch ---
*** tools/regression/run_tests.sh.orig	2007-07-31 19:44:25.000000000 -0500
--- tools/regression/run_tests.sh	2007-08-01 12:17:25.000000000 -0500
***************
*** 15,21 ****
  # This can be either a non-exitent directory or an already complete Boost
  # source tree.
  #
! boost_root="$HOME/CVSROOTs/Boost/boost_regression"
  
  #
  # Wether to fetch the most current Boost code from CVS (yes/no):
--- 15,21 ----
  # This can be either a non-exitent directory or an already complete Boost
  # source tree.
  #
! boost_root="/usr/src/redhat/BUILD/boost_1_34_1"
  
  #
  # Wether to fetch the most current Boost code from CVS (yes/no):
*************** test_tools=gcc
*** 42,58 ****
  toolset=gcc
  
  #
- # "comment_path" is the path to an html-file describing the test environment.
- # The content of this file will be embedded in the status pages being produced.
- #
- comment_path="$boost_root/../regression_comment.html"
- #
  # "test_dir" is the relative path to the directory to run the tests in,
  # defaults to "status" and runs all the tests, but could be a sub-directory
  # for example "libs/regex/test" to run the regex tests alone.
  #
  test_dir="status"
  
  
  ### DEFAULTS ARE OK FOR THESE.
  
--- 42,59 ----
  toolset=gcc
  
  #
  # "test_dir" is the relative path to the directory to run the tests in,
  # defaults to "status" and runs all the tests, but could be a sub-directory
  # for example "libs/regex/test" to run the regex tests alone.
  #
  test_dir="status"
  
+ #
+ # "comment_path" is the path to an html-file describing the test environment.
+ # The content of this file will be embedded in the status pages being produced.
+ #
+ comment_path="$boost_root/$test_dir/regression_comment.html"
+ 
  
  ### DEFAULTS ARE OK FOR THESE.
  
*************** exe_suffix=
*** 71,76 ****
--- 72,80 ----
  #
  bjam="$boost_root/tools/jam/src/bin/bjam$exe_suffix"
  
+ # bjam options
+ bjam_flags="--layout=system variant=release -sICU_PATH=/usr --user-config=$boost_root/user-config.jam"
+ 
  #
  # "process_jam_log", and "compiler_status" paths to built helper programs:
  # The location of the executables of the regression help programs. These
*************** else
*** 98,103 ****
--- 102,115 ----
  fi
  export BOOST_BUILD_PATH
  
+ # For shared objects.
+ old_ld_library_path=$LD_LIBRARY_PATH
+ old_ld_run_path=$LD_RUN_PATH
+ LD_LIBRARY_PATH="$boost_root/stage/lib:$old_ld_library_path"
+ LD_RUN_PATH="$boost_root/stage/lib:$old_ld_run_path"
+ export LD_LIBRARY_PATH
+ export LD_RUN_PATH
+ 
  #
  # STEP 0:
  #
*************** fi
*** 126,137 ****
  # STEP 1:
  # rebuild bjam if required:
  #
! echo building bjam:
! cd "$boost_root/tools/jam/src" && \
! LOCATE_TARGET=bin sh ./build.sh
! if test $? != 0 ; then
!     echo "bjam build failed."
!     exit 256
  fi
  
  #
--- 138,152 ----
  # STEP 1:
  # rebuild bjam if required:
  #
! echo "finding or building bjam":
! if test ! -f "$bjam" ; then
!   echo "building bjam":
!     cd "$boost_root/tools/jam/src" && \
!     LOCATE_TARGET=bin sh ./build.sh
!     if test $? != 0 ; then
!       echo "bjam build failed."
!       exit 256
!     fi
  fi
  
  #
*************** fi
*** 139,146 ****
  # rebuild the regression test helper programs if required:
  #
  echo building regression test helper programs:
! cd "$boost_root/tools/regression/build" && \
! "$bjam" $toolset release
  if test $? != 0 ; then
      echo "helper program build failed."
      exit 256
--- 154,160 ----
  # rebuild the regression test helper programs if required:
  #
  echo building regression test helper programs:
! cd "$boost_root/tools/regression/build" && "$bjam" $bjam_flags $toolset
  if test $? != 0 ; then
      echo "helper program build failed."
      exit 256
*************** for tool in $test_tools ; do
*** 158,164 ****
  #
  echo running the $tool regression tests:
  cd "$boost_root/$test_dir"
! "$bjam" $tool --dump-tests 2>&1 | tee regress.log
  
  #
  # STEP 4:
--- 172,180 ----
  #
  echo running the $tool regression tests:
  cd "$boost_root/$test_dir"
! echo "<p> begin time: " `date` "</p>" >> "$comment_path"
! "$bjam" $bjam_flags $tool --dump-tests 2>&1 | tee regress.log
! echo "<p> end time: " `date` "</p>" >> "$comment_path"
  
  #
  # STEP 4:
*************** if test $? != 0 ; then
*** 185,190 ****
--- 201,212 ----
      exit 256
  fi
  
+ # cleanup
+ LD_LIBRARY_PATH="$old_ld_library_path"
+ LD_RUN_PATH="$old_ld_run_path"
+ export LD_LIBRARY_PATH
+ export LD_RUN_PATH
+ 
  echo "done!"
  
  

boost-use-rpm-optflags.patch:

--- NEW FILE boost-use-rpm-optflags.patch ---
*** tools/build/v2/tools/gcc.jam.orig	2007-08-01 01:17:16.000000000 -0500
--- tools/build/v2/tools/gcc.jam	2007-08-01 01:17:46.000000000 -0500
*************** flags gcc.compile PCH_FILE <pch>on : <pc
*** 268,274 ****
  
  # Declare flags and action for compilation
  flags gcc.compile OPTIONS <optimization>off : -O0 ;
! flags gcc.compile OPTIONS <optimization>speed : -O3 ;
  flags gcc.compile OPTIONS <optimization>space : -Os ;
  
  flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
--- 268,274 ----
  
  # Declare flags and action for compilation
  flags gcc.compile OPTIONS <optimization>off : -O0 ;
! flags gcc.compile OPTIONS <optimization>speed : "$RPM_OPT_FLAGS" ;
  flags gcc.compile OPTIONS <optimization>space : -Os ;
  
  flags gcc.compile OPTIONS <inlining>off : -fno-inline ;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Jan 2006 23:14:27 -0000	1.8
+++ .cvsignore	2 Aug 2007 05:48:06 -0000	1.9
@@ -1,3 +1 @@
-boost_1_33_0.tar.bz2
-boost-1.33.1.20051114.tar.bz2
-boost_1_33_1.tar.bz2
+boost_1_34_1.tar.bz2


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- boost.spec	2 Apr 2007 14:42:09 -0000	1.34
+++ boost.spec	2 Aug 2007 05:48:06 -0000	1.35
@@ -1,13 +1,16 @@
 Name: boost
 Summary: The Boost C++ Libraries
-Version: 1.33.1
-Release: 13%{?dist}
+Version: 1.34.1
+Release: 1%{?dist}
 License: Boost Software License (GPL-Compatible, Free Software License)
 URL: http://www.boost.org/
 Group: System Environment/Libraries
-Source: %{name}_1_33_1.tar.bz2
-#Source: http://downloads.sourceforge.net/boost/boost_1_33_1.tar.bz2
+#Source: %{name}_1_34_1.tar.bz2
+Source: http://downloads.sourceforge.net/boost/boost_1_34_1.tar.bz2
+Obsoletes: boost-doc <= 1.30.2
+Obsoletes: boost-python <= 1.30.2
 Provides: boost-python = %{version}-%{release}
+Provides: boost-doc = %{version}-%{release}
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libstdc++-devel
 BuildRequires: bzip2-libs
@@ -18,16 +21,10 @@
 BuildRequires: python-devel
 BuildRequires: libicu
 BuildRequires: libicu-devel
-Patch0: boost-base.patch
-Patch1: boost-gcc-tools.patch
-Patch2: boost-thread.patch
-Patch3: boost-config-compiler-gcc.patch
-Patch4: boost-runtests.patch
-Patch5: boost-serialization-warnings.patch
-Patch6: boost-spirit-warnings.patch
-Patch7: boost-bind-gcc41.patch
-Patch8: boost-cxxflags-debug.patch
-Patch9: boost-python-vs-x86-64.patch
+Patch0: boost-configure.patch
+Patch1: boost-gcc-soname.patch
+Patch2: boost-use-rpm-optflags.patch
+Patch3: boost-run-tests.patch
 
 %description
 Boost provides free peer-reviewed portable C++ source libraries.  The
@@ -67,55 +64,69 @@
 %prep
 rm -rf %{buildroot}
 
-%setup -q -n %{name}_1_33_1
+%setup -q -n %{name}_1_34_1
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
 
 %build
-#build bjam
-(cd tools/build/jam_src && ./build.sh)
+BOOST_ROOT=`pwd`
+staged_dir=stage
+export BOOST_ROOT
+
+# build make tools, ie bjam, necessary for building libs, docs, and testing
+(cd tools/jam/src && ./build.sh)
+BJAM=`find tools/jam/src/ -name bjam -a -type f`
 
-#build boost with bjam
-BJAM=`find tools/build/jam_src/ -name bjam -a -type f`
-#BUILD_FLAGS="-sTOOLS=gcc -sBUILD=release <dllversion>1"
-#BUILD_FLAGS="-sTOOLS=gcc -sBUILD=release"
-BUILD_FLAGS="-d2 -sTOOLS=gcc -sBUILD=release"
+#BUILD_FLAGS="--with-toolset=gcc --prefix=$RPM_BUILD_ROOT%{_prefix}"
+BUILD_FLAGS="--with-toolset=gcc"
 PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
-PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
-REGEX_FLAGS="-sHAVE_ICU=1"
-$BJAM $PYTHON_FLAGS $REGEX_FLAGS $BUILD_FLAGS stage 
+PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION"
+REGEX_FLAGS="--with-icu"
+./configure $BUILD_FLAGS $PYTHON_FLAGS $REGEX_FLAGS 
+make all
+
+# build docs, requires a network connection for docbook XSLT stylesheets
+#cd ./doc
+#chmod +x ../tools/boostbook/setup_boostbook.sh
+#../tools/boostbook/setup_boostbook.sh
+#$BOOST_ROOT/$BJAM --v2 -sICU_PATH=/usr --user-config=../user-config.jam html
+#cd ..
 
 %check
-BOOST_ROOT=`pwd`;
-cd tools/regression;
-(cd ./build && $BOOST_ROOT/$BJAM)
-echo "<p>" `uname -a` "</p>" > regression_comment.html;
-echo "" >>  regression_comment.html;
-echo "<p>" `g++ --version` "</p>" >> regression_comment.html;
-chmod +x ./run_tests.sh;
-#uncomment next line to run tests: warning, takes a long time
-#./run_tests.sh;
-results1=$BOOST_ROOT/status/results.html
-results2=$BOOST_ROOT/status/results-links.html
-if [ -f $results2 ] && [ -f $results2 ]; then
-  testdate=`date +%Y%m%d`;
-  testarch=`uname -m`;
-  email=bkoz at redhat.com
-  mail -s "$testdate boost regression $testarch 1" $email < $results1;
-  mail -s "$testdate boost regression $testarch 2" $email < $results2;
+# --with tests activates checking
+%define with_tests %{?_with_tests:1}%{!?_with_tests:0}
+%define without_tests %{!?_with_tests:1}%{?_with_tests:0}
+
+%if %{with_tests}
+echo "<p>" `uname -a` "</p>" > status/regression_comment.html
+echo "" >> status/regression_comment.html
+echo "<p>" `g++ --version` "</p>" >> status/regression_comment.html
+echo "" >> status/regression_comment.html
+
+chmod +x tools/regression/run_tests.sh
+./tools/regression/run_tests.sh
+
+results1=status/cs-`uname`.html
+results2=status/cs-`uname`-links.html
+email=benjamin.kosnik at gmail.com
+if [ -f $results1 ] && [ -f $results2 ]; then
+  echo "sending results starting"
+  testdate=`date +%Y%m%d`
+  testarch=`uname -m`
+  results=boost-results-$testdate-$testarch.tar.bz2
+  tar -cvf boost-results-$testdate-$testarch.tar $results1 $results2
+  bzip2 -f boost-results-$testdate-$testarch.tar 
+  echo | mutt -s "$testdate boost regression $testarch" -a $results $email 
+  echo "sending results finished"
+else
+  echo "error sending results"
 fi
-cd ../..;
-
+%endif
 
 %install
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/boost-%{version}
@@ -125,16 +136,20 @@
   NAME=`basename $i`;
   install -p -m 0644 $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
 done;
-for i in `find stage -type f -name \*.so.*`; do
-  NAME=`basename $i`;
-  install -p -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
-done;
-for i in `find stage -type l -name \*.so`; do
-  NAME=`basename $i`;
-  SONAME=$NAME.2;
-  ln -s $NAME.%{version} $SONAME;
-  mv $SONAME $RPM_BUILD_ROOT%{_libdir}/$SONAME;
-  mv $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
+for i in `find stage -type f -name \*.so`; do
+  NAME=$i;
+  SONAME=$i.2;
+  VNAME=$i.%{version};
+  base=`basename $i`;
+  NAMEbase=$base;
+  SONAMEbase=$base.2;
+  VNAMEbase=$base.%{version};
+  mv $i $VNAME;
+  ln -s $VNAMEbase $SONAME;
+  ln -s $VNAMEbase $NAME;
+  install -p -m 755 $VNAME $RPM_BUILD_ROOT%{_libdir}/$VNAMEbase;
+  mv $SONAME $RPM_BUILD_ROOT%{_libdir}/$SONAMEbase;
+  mv $NAME $RPM_BUILD_ROOT%{_libdir}/$NAMEbase;
 done;
 
 # install include files
@@ -155,14 +170,15 @@
 done
 cd ../..;
 
+# remove scripts used to generate include files 
+find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec rm {} \;
+
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
-%post 
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files 
 %defattr(-, root, root, -)
@@ -183,6 +199,16 @@
 %doc %{_docdir}/boost-%{version}
 
 %changelog
+* Tue Jul 31 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1-1
+- Update to boost_1_34_1.
+- Source via http.
+- Philipp Thomas <pth.suse.de> fix for RPM_OPT_FLAGS
+- Philipp Thomas <pth.suse.de> fix for .so sym links.
+- (#225622) Patrice Dumas review comments. 
+
+* Tue Jun 26 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.1.rc1-0.1
+- Update to boost_1_34_1_RC1.
+
 * Mon Apr 02 2007 Benjamin Kosnik <bkoz at redhat.com> 1.33.1-13
 - (#225622: Merge Review: boost)
   Change static to devel-static.
@@ -209,6 +235,12 @@
   Install static libs with 0644 permissions.
   Use %doc for doc files.
 
+* Mon Jan 22 2007 Benjamin Kosnik <bkoz at redhat.com> 1.34.0-0.5
+- Update to boost.RC_1_34_0 snapshot as of 2007-01-19.
+- Modify build procedures for boost build v2.
+- Add *-mt variants for libraries, or at least variants that use
+  threads (regex and thread).
+
 * Thu Nov 23 2006 Benjamin Kosnik <bkoz at redhat.com> 1.33.1-10
 - (#182414: boost: put tests in %check section) via Rex Dieter
 - Fix EVR with %{?dist} tag via Gianluca Sforna


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Jan 2006 23:14:27 -0000	1.10
+++ sources	2 Aug 2007 05:48:06 -0000	1.11
@@ -1,3 +1 @@
-56fafc275dc0e195ec2f27e8769482cc  boost_1_33_0.tar.bz2
-74785688e823771402cfa5753fe95b8a  boost-1.33.1.20051114.tar.bz2
-2b999b2fb7798e1737d1fff8fac602ef  boost_1_33_1.tar.bz2
+2d938467e8a448a2c9763e0a9f8ca7e5  boost_1_34_1.tar.bz2


--- boost-base.patch DELETED ---


--- boost-bind-gcc41.patch DELETED ---


--- boost-config-compiler-gcc.patch DELETED ---


--- boost-cxxflags-debug.patch DELETED ---


--- boost-gcc-tools.patch DELETED ---


--- boost-python-vs-x86-64.patch DELETED ---


--- boost-runtests.patch DELETED ---


--- boost-serialization-warnings.patch DELETED ---


--- boost-spirit-warnings.patch DELETED ---


--- boost-thread.patch DELETED ---


