QPID-1162: added patches and additions required to build against boost 1.32. These are not deemed desirable for direct application to the trunk, but can be used to simply update an svn checkout for compilation against that boost version.

Contributed by Mick Goulish and Justin Ross.



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@681164 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 148 insertions, 0 deletions

diff --git a/qpid/cpp/boost-1.32-support/Makefile b/qpid/cpp/boost-1.32-support/Makefile
new file mode 100644
index 0000000000..fb440e26da
--- /dev/null
+++ b/qpid/cpp/boost-1.32-support/Makefile
@@ -0,0 +1,10 @@
+.PHONY: default apply
+
+default:
+	@echo "Run 'make apply' to patch the source"
+
+apply: main.patch ../src/boost
+	patch -d .. -p0 < main.patch
+
+../src/boost: boost.tar.gz
+	tar -C .. -xvzf boost.tar.gz
diff --git a/qpid/cpp/boost-1.32-support/README b/qpid/cpp/boost-1.32-support/README
new file mode 100644
index 0000000000..3c0edc8697
--- /dev/null
+++ b/qpid/cpp/boost-1.32-support/README
@@ -0,0 +1,8 @@
+For example:
+
+$ cd qpid/cpp/boost-1.32-support  # The directory containing this file
+$ make apply
+[Some untarring and patching]
+$ cd ..
+
+And then build using the normal methods.
diff --git a/qpid/cpp/boost-1.32-support/boost.tar.gz b/qpid/cpp/boost-1.32-support/boost.tar.gz
new file mode 100644
index 0000000000..7f97622681
--- /dev/null
+++ b/qpid/cpp/boost-1.32-support/boost.tar.gz
diff --git a/qpid/cpp/boost-1.32-support/main.patch b/qpid/cpp/boost-1.32-support/main.patch
new file mode 100644
index 0000000000..af9b839313
--- /dev/null
+++ b/qpid/cpp/boost-1.32-support/main.patch
@@ -0,0 +1,130 @@
+Index: src/tests/.valgrind.supp
+===================================================================
+--- src/tests/.valgrind.supp	(revision 681145)
++++ src/tests/.valgrind.supp	(working copy)
+@@ -193,8 +193,112 @@
+ }
+ 
+ {
+-  CPG related errors - seem benign but should invesgitate.
++   similar to other param error, below.
+    Memcheck:Param
++   socketcall.sendto(msg)
++   fun:send
++   fun:get_mapping
++}
++
++{
++   RHEL4 -- we think Boost is responsible for these leaks.
++   Memcheck:Leak
++   fun:_Znwm
++   fun:_ZN5boost15program_options??options_description*
++}
++
++{
++   RHEL4 -- we think Boost is responsible for these leaks.
++   Memcheck:Leak
++   fun:_Znwm
++   fun:_ZN5boost9unit_test9test_case*
++}
++
++{
++   RHEL4 -- we think Boost is responsible for these leaks.
++   Memcheck:Leak
++   fun:calloc
++   fun:_dlerror_run
++   fun:dlopen@@GLIBC_2.2.5
++   fun:_ZN4qpid3sys5Shlib4loadEPKc
++   fun:_Z9testShlibv
++   fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv
++   obj:/usr/lib64/libboost_unit_test_framework.so.1.32.0
++   fun:_ZN5boost17execution_monitor7executeEbi
++   fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor21execute_and_translateEPNS0_9test_caseEMS3_FvvEi
++   fun:_ZN5boost9unit_test9test_case3runEv
++   fun:_ZN5boost9unit_test10test_suite6do_runEv
++   fun:_ZN5boost9unit_test9test_case3runEv
++   fun:main
++}
++
++{
++   RHEL4 -- we think Boost is responsible for these leaks.
++   Memcheck:Leak
++   fun:calloc
++   fun:_dl_allocate_tls
++   fun:pthread_create@@GLIBC_2.2.5
++   fun:_ZN4qpid6broker5Timer5startEv
++   fun:_ZN4qpid6broker5TimerC1Ev
++   fun:_ZN4qpid6broker10DtxManagerC1Ev
++}
++
++{
++   INVESTIGATE
++   Memcheck:Leak
++   fun:calloc
++   fun:_dl_allocate_tls
++   fun:pthread_create@@GLIBC_2.2.5
++   fun:_ZN4qpid6client9Connector4initEv
++   fun:_ZN4qpid6client14ConnectionImpl4openERKSsiS3_S3_S3_
++}
++
++{
++   INVESTIGATE
++   Memcheck:Param
++   write(buf)
++   obj:/lib64/tls/libc-2.3.4.so
++   fun:_ZNK4qpid3sys6Socket5writeEPKvm
++   fun:_ZN4qpid3sys8AsynchIO9writeableERNS0_14DispatchHandleE
++}
++
++{
++   INVESTIGATE
++   Memcheck:Leak
++   fun:calloc
++   fun:_dl_allocate_tls
++   fun:pthread_create@@GLIBC_2.2.5
++   fun:_ZN4qpid6broker5Timer5startEv
++   fun:_ZN4qpid6broker5TimerC1Ev
++   fun:_ZN4qpid6broker10DtxManagerC1Ev
++}
++{
++   RHEL4 (and FC5)
++   Memcheck:Leak 
++   fun:calloc
++   fun:_dl_allocate_tls
++   fun:pthread_create@@GLIBC_2.2.5
++   fun:_ZN4qpid6client9Connector4initEv
++}
++{
++   INVESTIGATE
++   Memcheck:Param
++   futex(utime)
++   fun:__lll_mutex_unlock_wake
++}
++{
++   SAME ISSUE, NEW OCCURENCE
++   Memcheck:Leak
++   fun:calloc
++   fun:_dl_allocate_tls
++   fun:pthread_create@@GLIBC_2.2.5
++   fun:_ZN4qpid6broker5Timer5startEv
++   fun:_ZN4qpid6broker5TimerC1Ev
++   fun:_ZN4qpid6broker12LinkRegistryC1EPNS0_6BrokerE
++}
++{
++   CPG related errors - seem benign but should invesgitate.
++   Memcheck:Param
+    socketcall.sendmsg(msg.msg_iov[i])
+    fun:sendmsg
+    obj:/usr/lib/openais/libcpg.so.2.0.0
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 681145)
++++ configure.ac	(working copy)
+@@ -64,7 +64,6 @@
+ 	# -Wunreachable-code -Wpadded -Winline
+ 	# -Wshadow - warns about boost headers.
+ 	if test "${enableval}" = yes; then
+-	    gl_COMPILER_FLAGS(-Werror)
+ 	    gl_COMPILER_FLAGS(-pedantic)
+ 	    gl_COMPILER_FLAGS(-Wall)
+ 	    gl_COMPILER_FLAGS(-Wextra)