rpms/boost/devel boost-base.patch, 1.2, 1.3 boost-gcc-tools.patch, 1.4, 1.5 boost.spec, 1.10, 1.11

Fri Mar 18 16:35:25 UTC 2005

Update of /cvs/dist/rpms/boost/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6655

Modified Files:
	boost-base.patch boost-gcc-tools.patch boost.spec 
Log Message:

* Fri Mar 18 2005 Benjamin Kosnik <bkoz at redhat.com> 1.32.0-5
- Revert boost-base.patch to old behavior.
- Use SONAMEVERSION instead of dllversion.




boost-base.patch:
 boost-base.jam |    8 !!!!!!!!
 1 files changed, 8 modifications(!)

Index: boost-base.patch
===================================================================
RCS file: /cvs/dist/rpms/boost/devel/boost-base.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- boost-base.patch	17 Mar 2005 01:12:29 -0000	1.2
+++ boost-base.patch	18 Mar 2005 16:35:21 -0000	1.3
@@ -1,23 +1,28 @@
-*** tools/build/v1/boost-base.jam.orig	2005-03-15 22:38:05.110845776 -0600
---- tools/build/v1/boost-base.jam	2005-03-15 22:39:21.250352319 -0600
+Index: tools/build/v1/boost-base.jam
+===================================================================
+RCS file: /cvsroot/boost/boost/tools/build/v1/boost-base.jam,v
+retrieving revision 1.129
+diff -c -p -r1.129 boost-base.jam
+*** tools/build/v1/boost-base.jam	28 Jan 2004 22:50:17 -0000	1.129
+--- tools/build/v1/boost-base.jam	1 Apr 2004 22:48:45 -0000
 *************** rule common-variant-tag ( toolset varian
-*** 2651,2660 ****
-          version-tag = $(version-tag:J="_") ;
-      }
+*** 2621,2630 ****
+      local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ;
+      version-tag = $(version-tag:J="_") ;
       
 !     tags += $(toolset-tag:J=) ;
-      tags += $(thread-tag:J=) ;
+!     tags += $(thread-tag:J=) ;
 !     tags += $(runtime-tag:J=) ;
 !     tags += $(version-tag) ;
       
       if $(tags)
       {
---- 2651,2660 ----
-          version-tag = $(version-tag:J="_") ;
-      }
+--- 2621,2630 ----
+      local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ;
+      version-tag = $(version-tag:J="_") ;
       
 ! #    tags += $(toolset-tag:J=) ;
-      tags += $(thread-tag:J=) ;
+! #    tags += $(thread-tag:J=) ;
 ! #    tags += $(runtime-tag:J=) ;
 ! #    tags += $(version-tag) ;
       

boost-gcc-tools.patch:
 gcc-tools.jam |    5 +!!!!
 1 files changed, 1 insertion(+), 4 modifications(!)

Index: boost-gcc-tools.patch
===================================================================
RCS file: /cvs/dist/rpms/boost/devel/boost-gcc-tools.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- boost-gcc-tools.patch	17 Mar 2005 01:12:29 -0000	1.4
+++ boost-gcc-tools.patch	18 Mar 2005 16:35:21 -0000	1.5
@@ -1,5 +1,5 @@
-*** tools/build/v1/gcc-tools.jam.orig	2005-03-15 22:41:36.879694255 -0600
---- tools/build/v1/gcc-tools.jam	2005-03-15 22:42:01.449887423 -0600
+*** tools/build/v1/gcc-tools.jam.orig	2005-03-18 09:58:30.227128264 -0600
+--- tools/build/v1/gcc-tools.jam	2005-03-18 10:00:20.235025969 -0600
 *************** flags gcc LINKFLAGS <runtime-link>static
 *** 60,66 ****
   flags gcc CFLAGS <debug-symbols>on : -g ;
@@ -17,3 +17,30 @@
   
   # Other optimizations we might want for GCC
   # -fforce-mem -fomit-frame-pointer
+*************** flags gcc FINDLIBS <find-library> ;
+*** 352,357 ****
+--- 352,358 ----
+  flags gcc DLLVERSION <dllversion> ;
+  DLLVERSION = $(DLLVERSION[1]) ;
+  DLLVERSION ?= $(BOOST_VERSION) ;
++ SONAMEVERSION = 1 ;
+  
+  flags gcc TARGET_TYPE <target-type> ;
+  
+*************** rule Link-action
+*** 387,393 ****
+      if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
+      {
+          OUTTAG on $(<) = ".$(DLLVERSION)" ;
+!         SOTAG on $(<) = ".$(DLLVERSION)" ;
+          ACTION_1 on $(<) = "" ;
+      }
+      else
+--- 388,394 ----
+      if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
+      {
+          OUTTAG on $(<) = ".$(DLLVERSION)" ;
+!         SOTAG on $(<) = ".$(SONAMEVERSION)" ;
+          ACTION_1 on $(<) = "" ;
+      }
+      else


Index: boost.spec
===================================================================
RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- boost.spec	17 Mar 2005 01:12:29 -0000	1.10
+++ boost.spec	18 Mar 2005 16:35:21 -0000	1.11
@@ -3,7 +3,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.32.0
-Release: 4
+Release: 5
 License: Boost Software License
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -16,7 +16,6 @@
 Patch0: boost-base.patch
 Patch1: boost-gcc-tools.patch
 Patch2: boost-thread.patch
-Patch3: boost-config-compiler-gcc.patch
 
 %description
 Boost provides free peer-reviewed portable C++ source libraries.  The
@@ -44,7 +43,6 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
-%patch3 -p0
 
 %build
 #build bjam
@@ -53,7 +51,8 @@
 BJAM=`find tools/build/jam_src/ -name bjam -a -type f`
 PYTHON_VERSION=`python -V 2>&1 |sed 's,.* \([0-9]\.[0-9]\)\(\.[0-9]\)\?.*,\1,'`
 PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
-$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release <dllversion>1" stage 
+#$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release <dllversion>1" stage 
+$BJAM $PYTHON_FLAGS "-sTOOLS=gcc" "-sBUILD=release" stage 
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -101,6 +100,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Mar 18 2005 Benjamin Kosnik <bkoz at redhat.com> 1.32.0-5
+- Revert boost-base.patch to old behavior.
+- Use SONAMEVERSION instead of dllversion.
+
 * Wed Mar 16 2005 Benjamin Kosnik <bkoz at redhat.com> 1.32.0-4
 - (#142612: Compiling Boost 1.32.0 Failed in RHEL 3.0 on Itanium2) 
 - (#150069: libboost_python.so is missing)
@@ -110,7 +113,7 @@
 - Change boost-base.patch to show thread tags.
 - Change boost-gcc-tools.patch to use SOTAG, compile with dllversion.
 - Add symbolic links to files.
-- Sanity check can compile with gcc-3.3.x, gcc-3.4.2.
+- Sanity check can compile with gcc-3.3.x, gcc-3.4.2, gcc-4.0.x., gcc-4.1.x.
 
 * Thu Dec 02 2004 Benjamin Kosnik <bkoz at redhat.com> 1.32.0-3
 - (#122817: libboost_*.so symlinks missing)


