- (#142612: Compiling Boost 1.32.0 Failed in RHEL 3.0 on Itanium2)

- (#150069: libboost_python.so is missing)
- (#141617: bad patch boost-base.patch)
- (#122817: libboost_*.so symlinks missing)
- Re-add boost-thread.patch.
- 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.

boost-base.patch

@@ -1,28 +1,23 @@
-Index: tools/build/v1/boost-base.jam
+*** 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
-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
-*** 2621,2630 ****
+*** 2651,2660 ****
-      local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ;
+          version-tag = $(version-tag:J="_") ;
-      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)
       {
---- 2621,2630 ----
+--- 2651,2660 ----
-      local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(version-number[1]) ] ;
+          version-tag = $(version-tag:J="_") ;
-      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-config-compiler-gcc.patch

@@ -0,0 +1,21 @@
+*** boost/config/compiler/gcc.hpp.orig	2005-03-16 17:25:06.611062784 -0600
+--- boost/config/compiler/gcc.hpp	2005-03-16 17:31:00.965341000 -0600
+***************
+*** 84,91 ****
+  #  error "Compiler not configured - please reconfigure"
+  #endif
+  //
+! // last known and checked version is 3.4:
+! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4))
+  #  if defined(BOOST_ASSERT_CONFIG)
+  #     error "Unknown compiler version - please run the configure tests and report the results"
+  #  else
+--- 84,91 ----
+  #  error "Compiler not configured - please reconfigure"
+  #endif
+  //
+! // last known and checked version is 4.1:
+! #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 1))
+  #  if defined(BOOST_ASSERT_CONFIG)
+  #     error "Unknown compiler version - please run the configure tests and report the results"
+  #  else

boost-gcc-tools.patch

@@ -1,5 +1,5 @@
-*** tools/build/v1/gcc-tools.jam	2004-11-29 17:38:40.295847046 -0600
+*** tools/build/v1/gcc-tools.jam.orig	2005-03-15 22:41:36.879694255 -0600
---- tools/build/v1/gcc-tools.jam.new	2004-11-29 17:39:37.962664115 -0600
+--- tools/build/v1/gcc-tools.jam	2005-03-15 22:42:01.449887423 -0600
 *************** flags gcc LINKFLAGS <runtime-link>static
 *** 60,66 ****
   flags gcc CFLAGS <debug-symbols>on : -g ;
@@ -17,20 +17,3 @@
   
   # Other optimizations we might want for GCC
   # -fforce-mem -fomit-frame-pointer
-*************** 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
---- 387,393 ----
-      if $(DLLVERSION) && $(TARGET_TYPE) in $(SHARED_TYPES) && ( $(OS) = LINUX || $(OS) = OPENBSD ) && ! $(NO_GNU_LN)
-      {
-          OUTTAG on $(<) = ".$(DLLVERSION)" ;
-!         SOTAG on $(<) = "" ;
-          ACTION_1 on $(<) = "" ;
-      }
-      else

boost-thread.patch

@@ -0,0 +1,19 @@
+*** boost/config/compiler/gcc.hpp.orig	2005-03-15 22:34:33.881774946 -0600
+--- boost/config/compiler/gcc.hpp	2005-03-15 22:33:35.247609622 -0600
+***************
+*** 59,65 ****
+  // those platforms where we can know for sure). It will get turned off again
+  // later if no threading API is detected.
+  //
+! #if !defined(__MINGW32__) && !defined(linux) && !defined(__linux) && !defined(__linux__)
+  # define BOOST_HAS_THREADS
+  #endif 
+  
+--- 59,65 ----
+  // those platforms where we can know for sure). It will get turned off again
+  // later if no threading API is detected.
+  //
+! #if !defined(__MINGW32__) 
+  # define BOOST_HAS_THREADS
+  #endif 
+  

boost.spec

@@ -3,7 +3,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.32.0
-Release: 3
+Release: 4
 License: Boost Software License
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -15,6 +15,8 @@ Obsoletes: boost-doc <= 1.30.2
 Obsoletes: boost-python <= 1.30.2
 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
@@ -41,6 +43,8 @@ rm -rf $RPM_BUILD_ROOT
 %setup -n %{tarball_name} -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
+%patch3 -p0
 
 %build
 #build bjam
@@ -49,8 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 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}
@@ -65,6 +68,10 @@ for i in `find stage -type f -name \*.so.*`; do
   NAME=`basename $i`;
   install -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
 done;
+for i in `find stage -type l -name \*.so`; do
+  NAME=`basename $i`;
+  mv $i $RPM_BUILD_ROOT%{_libdir}/$NAME;
+done;
 
 # install include files
 for i in `find boost -type d`; do
@@ -83,9 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun 
 /sbin/ldconfig
 
-%files
+%files 
 %defattr(-, root, root)
 %{_libdir}/*.so.*
+%{_libdir}/*.so
 
 %files devel
 %defattr(-, root, root)
@@ -93,6 +101,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Mar 16 2005 Benjamin Kosnik <bkoz@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)
+- (#141617: bad patch boost-base.patch)
+- (#122817: libboost_*.so symlinks missing)
+- Re-add boost-thread.patch.
+- 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.
+
 * Thu Dec 02 2004 Benjamin Kosnik <bkoz@redhat.com> 1.32.0-3
 - (#122817: libboost_*.so symlinks missing)
 - (#141574: half of the package is missing)