rpms/mingw32-boost/devel boost-soname.patch, NONE, 1.1 boost-version-override.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 boost-bitset.patch, 1.1, 1.2 boost-function_template.patch, 1.1, 1.2 boost-unneccessary_iostreams.patch, 1.1, 1.2 mingw32-boost.spec, 1.1, 1.2 sources, 1.2, 1.3 boost-1_37_0-smp.patch, 1.1, NONE boost-configure.patch, 1.1, NONE boost-gcc-implib.patch, 1.1, NONE boost-gcc43.patch, 1.1, NONE

sailer sailer at fedoraproject.org
Thu Jun 18 11:51:16 UTC 2009 

Author: sailer

Update of /cvs/extras/rpms/mingw32-boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3824

Modified Files:
	.cvsignore boost-bitset.patch boost-function_template.patch 
	boost-unneccessary_iostreams.patch mingw32-boost.spec sources 
Added Files:
	boost-soname.patch boost-version-override.patch 
Removed Files:
	boost-1_37_0-smp.patch boost-configure.patch 
	boost-gcc-implib.patch boost-gcc43.patch 
Log Message:
update to 1.39.0


boost-soname.patch:

--- NEW FILE boost-soname.patch ---
*** tools/build/v2/tools/gcc.jam.orig	2009-05-05 12:45:31.000000000 -0700
--- tools/build/v2/tools/gcc.jam	2009-05-05 12:48:23.000000000 -0700
*************** if [ os.name ] != NT && [ os.name ] != O
*** 355,361 ****
      # OSF does have an option called -soname but it does not seem to work as
      # expected, therefore it has been disabled.
      HAVE_SONAME   = "" ;
!     SONAME_OPTION = -h ;
  }
  
  
--- 355,362 ----
      # OSF does have an option called -soname but it does not seem to work as
      # expected, therefore it has been disabled.
      HAVE_SONAME   = "" ;
!     SONAME_OPTION = -soname ;
!     SONAME_VERSION = _FEDORA_SONAME ;
  }
  
  
*************** rule link.dll ( targets * : sources * : 
*** 793,799 ****
  # Differs 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)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
  }
  
  rule setup-threading ( targets * : sources * : properties * )
--- 794,800 ----
  # Differs 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)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
  }
  
  rule setup-threading ( targets * : sources * : properties * )

boost-version-override.patch:

--- NEW FILE boost-version-override.patch ---
*** Jamroot.orig	2009-05-06 12:46:31.000000000 -0700
--- Jamroot	2009-05-06 18:18:17.000000000 -0700
*************** rule tag ( name : type ? : property-set 
*** 344,350 ****
          else
          {
              local result = [ common.format-name
!                 <base> 
                  -$(BUILD_ID)
                  : $(name) : $(type) : $(property-set) ] ;
  
--- 344,350 ----
          else
          {
              local result = [ common.format-name
!                 <base> <threading>
                  -$(BUILD_ID)
                  : $(name) : $(type) : $(property-set) ] ;
  
*************** rule tag ( name : type ? : property-set 
*** 356,362 ****
              # suffixes either. Pgi compilers can not accept library with version
              # suffix.
              if $(type) = SHARED_LIB &&
!               ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
                  ! ( [ $(property-set).get <toolset> ] in pgi ) )
              {
                  result = $(result).$(BOOST_VERSION)  ;
--- 356,362 ----
              # suffixes either. Pgi compilers can not accept library with version
              # suffix.
              if $(type) = SHARED_LIB &&
!               ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix linux ) &&
                  ! ( [ $(property-set).get <toolset> ] in pgi ) )
              {
                  result = $(result).$(BOOST_VERSION)  ;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-boost/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jun 2009 17:31:33 -0000	1.2
+++ .cvsignore	18 Jun 2009 11:50:43 -0000	1.3
@@ -1 +1 @@
-boost_1_37_0.tar.bz2
+boost_1_39_0.tar.bz2

boost-bitset.patch:

Index: boost-bitset.patch
===================================================================
RCS file: /cvs/extras/rpms/mingw32-boost/devel/boost-bitset.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- boost-bitset.patch	17 Jun 2009 17:31:33 -0000	1.1
+++ boost-bitset.patch	18 Jun 2009 11:50:43 -0000	1.2
@@ -1,5 +1,5 @@
---- boost_1_37_0/boost/dynamic_bitset/dynamic_bitset.hpp.debug	2008-10-22 03:13:59.000000000 +0900
-+++ boost_1_37_0/boost/dynamic_bitset/dynamic_bitset.hpp	2009-03-23 03:36:40.000000000 +0900
+--- boost/dynamic_bitset/dynamic_bitset.hpp.debug	2008-10-22 03:13:59.000000000 +0900
++++ boost/dynamic_bitset/dynamic_bitset.hpp	2009-03-23 03:36:40.000000000 +0900
 @@ -1017,8 +1017,11 @@
                            ? access_by_bytes
                            : access_by_blocks;

boost-function_template.patch:

Index: boost-function_template.patch
===================================================================
RCS file: /cvs/extras/rpms/mingw32-boost/devel/boost-function_template.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- boost-function_template.patch	17 Jun 2009 17:31:33 -0000	1.1
+++ boost-function_template.patch	18 Jun 2009 11:50:43 -0000	1.2
@@ -1,5 +1,6 @@
---- boost/function/function_template.hpp.orig	2008-12-19 10:32:27.000000000 +0000
-+++ boost/function/function_template.hpp	2008-12-19 10:33:27.000000000 +0000
+diff -ru boost/function/function_template.hpp boost/function/function_template.hpp
+--- boost/function/function_template.hpp	2009-05-10 10:31:29.000000000 +0100
++++ boost/function/function_template.hpp	2009-05-10 10:49:46.000000000 +0100
 @@ -950,10 +950,10 @@
            f.vtable->manager(f.functor, this->functor,
                              boost::detail::function::move_functor_tag);

boost-unneccessary_iostreams.patch:

Index: boost-unneccessary_iostreams.patch
===================================================================
RCS file: /cvs/extras/rpms/mingw32-boost/devel/boost-unneccessary_iostreams.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- boost-unneccessary_iostreams.patch	17 Jun 2009 17:31:33 -0000	1.1
+++ boost-unneccessary_iostreams.patch	18 Jun 2009 11:50:44 -0000	1.2
@@ -1,4 +1,4 @@
-diff -ru boost_1_37_0.orig/boost/spirit/home/classic/iterator/multi_pass.hpp boost_1_37_0/boost/spirit/home/classic/iterator/multi_pass.hpp
+diff -ru boost/spirit/home/classic/iterator/multi_pass.hpp boost/spirit/home/classic/iterator/multi_pass.hpp
 --- boost/spirit/home/classic/iterator/multi_pass.hpp	2009-01-09 10:38:36.000000000 +0000
 +++ boost/spirit/home/classic/iterator/multi_pass.hpp	2009-01-09 10:39:41.000000000 +0000
 @@ -12,7 +12,6 @@


Index: mingw32-boost.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-boost/devel/mingw32-boost.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-boost.spec	17 Jun 2009 17:31:34 -0000	1.1
+++ mingw32-boost.spec	18 Jun 2009 11:50:44 -0000	1.2
@@ -4,11 +4,11 @@
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
 
-%global sonamever 4
+%global sonamever 5
 
 %global name1 boost
 %global vermajor 1
-%global verminor 37
+%global verminor 39
 %global verrelease 0
 
 %global verdot %{vermajor}.%{verminor}.%{verrelease}
@@ -16,23 +16,21 @@
 
 Name:           mingw32-%{name1}
 Version:        %{verdot}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        MinGW Windows port of Boost C++ Libraries
 
 License:        Boost
 Group:          Development/Libraries
 URL:            http://www.boost.org/
-Source0:        http://downloads.sourceforge.net/boost/%{name1}_%{verunderscore}.tar.bz2
+Source0:        http://surfnet.dl.sourceforge.net/sourceforge/%{name1}/%{name1}_%{verunderscore}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:  boost-configure.patch
-Patch2:  boost-run-tests.patch
-Patch3:  boost-gcc43.patch
-Patch5:  boost-function_template.patch
-Patch6:  boost-unneccessary_iostreams.patch
-Patch7:  boost-1_37_0-smp.patch
-Patch8:  boost-bitset.patch
-Patch9:  boost-gcc-implib.patch
+Patch0: boost-version-override.patch
+Patch2: boost-run-tests.patch
+Patch3: boost-soname.patch
+Patch4: boost-unneccessary_iostreams.patch
+Patch5: boost-bitset.patch
+Patch6: boost-function_template.patch
 Patch10: boost-regexdll.patch
 
 BuildArch:      noarch
@@ -75,12 +73,10 @@ Static version of the MinGW Windows Boos
 %setup -q -n %{name1}_%{verunderscore}
 %patch0 -p0
 %patch2 -p0
-%patch3 -p1
+sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH3} | %{__patch} -p0 --fuzz=0
+%patch4 -p0
 %patch5 -p0
 %patch6 -p0
-sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0
-%patch8 -p1
-%patch9 -p0
 %patch10 -p0
 
 %build
@@ -105,19 +101,18 @@ PTW32_INCLUDE=/usr/i686-pc-mingw32/sys-r
 PTW32_LIB=/usr/i686-pc-mingw32/sys-root/mingw/lib
 export EXPAT_INCLUDE EXPAT_LIBPATH PTW32_INCLUDE PTW32_LIB
 
-./configure $BUILD_FLAGS $PYTHON_FLAGS $REGEX_FLAGS
+./bootstrap.sh $BUILD_FLAGS $PYTHON_FLAGS $REGEX_FLAGS
 
 # Make it use the cross-compiler instead of gcc.
-rm user-config.jam
 echo "using gcc : : %{_mingw32_cxx}" > user-config.jam
 echo "        : # options" >> user-config.jam
 echo "          <rc>%{_mingw32_windres}" >> user-config.jam
 echo "          <archiver>%{_mingw32_ar}" >> user-config.jam
 echo "        ;" >> user-config.jam
 
-perl -i -pe 's/^BJAM_CONFIG=(.*)$/BJAM_CONFIG=\1 link=static,shared target-os=windows/' Makefile
-
-make %{?_smp_mflags} all
+BUILD_VARIANTS="variant=release threading=single,multi debug-symbols=on link=static,shared target-os=windows"
+BUILD_FLAGS="-d2 --layout=system --user-config=user-config.jam $BUILD_VARIANTS"
+$BJAM $BUILD_FLAGS %{?_smp_mflags} stage
 
 
 %install
@@ -284,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 18 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.39.0-1
+- update to 1.39.0
+
 * Thu May 28 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.37.0-4
 - use boost buildsystem to build DLLs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-boost/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jun 2009 17:31:34 -0000	1.2
+++ sources	18 Jun 2009 11:50:44 -0000	1.3
@@ -1 +1 @@
-8d9f990bfb7e83769fa5f1d6f065bc92  boost_1_37_0.tar.bz2
+a17281fd88c48e0d866e1a12deecbcc0  boost_1_39_0.tar.bz2


--- boost-1_37_0-smp.patch DELETED ---


--- boost-configure.patch DELETED ---


--- boost-gcc-implib.patch DELETED ---


--- boost-gcc43.patch DELETED ---

More information about the fedora-extras-commits mailing list