Tag M4 RC9M4

git-svn-id: https://svn.apache.org/repos/asf/qpid/tags/M4@734202 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 151 insertions, 0 deletions

diff --git a/RC9/qpid/cpp/boost-1.32-support/Makefile b/RC9/qpid/cpp/boost-1.32-support/Makefile
new file mode 100644
index 0000000000..f0907f7fda
--- /dev/null
+++ b/RC9/qpid/cpp/boost-1.32-support/Makefile
@@ -0,0 +1,11 @@
+.PHONY: default apply
+
+default:
+	@echo "Run 'make apply' to patch the source"
+
+apply: main.patch ../src/boost
+	patch -d .. -p0 < main.patch
+	cat supressions >> ../src/tests/.valgrind.supp
+
+../src/boost: boost.tar.gz
+	tar -C .. -xvzf boost.tar.gz
diff --git a/RC9/qpid/cpp/boost-1.32-support/README b/RC9/qpid/cpp/boost-1.32-support/README
new file mode 100644
index 0000000000..3c0edc8697
--- /dev/null
+++ b/RC9/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/RC9/qpid/cpp/boost-1.32-support/boost.tar.gz b/RC9/qpid/cpp/boost-1.32-support/boost.tar.gz
new file mode 100644
index 0000000000..7f97622681
--- /dev/null
+++ b/RC9/qpid/cpp/boost-1.32-support/boost.tar.gz
diff --git a/RC9/qpid/cpp/boost-1.32-support/main.patch b/RC9/qpid/cpp/boost-1.32-support/main.patch
new file mode 100644
index 0000000000..952c0e7aad
--- /dev/null
+++ b/RC9/qpid/cpp/boost-1.32-support/main.patch
@@ -0,0 +1,25 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 718931)
++++ configure.ac	(working copy)
+@@ -66,7 +66,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)
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am	(revision 718931)
++++ src/Makefile.am	(working copy)
+@@ -37,7 +37,7 @@
+   qpid/broker/windows/BrokerDefaults.cpp \
+   qpid/broker/windows/SaslAuthenticator.cpp
+ 
+-EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(windows_dist)
++EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(windows_dist) $(top_srcdir)/src/boost
+ 
+ ## Generated code
+ 
diff --git a/RC9/qpid/cpp/boost-1.32-support/supressions b/RC9/qpid/cpp/boost-1.32-support/supressions
new file mode 100644
index 0000000000..5b5c81036b
--- /dev/null
+++ b/RC9/qpid/cpp/boost-1.32-support/supressions
@@ -0,0 +1,107 @@
+{
+   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:_ZN4qpid3sys13ThreadPrivateC1EPNS0_8RunnableE
+   fun:_ZN4qpid3sys6ThreadC1EPNS0_8RunnableE
+   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:_ZN4qpid3sys13ThreadPrivateC1EPNS0_8RunnableE
+   fun:_ZN4qpid3sys6ThreadC1EPNS0_8RunnableE
+   fun:_ZN4qpid6broker5Timer5startEv
+   fun:_ZN4qpid6broker5TimerC1Ev
+   fun:_ZN4qpid6broker12LinkRegistryC1EPNS0_6BrokerE
+}
+{
+   <insert a suppression name here>
+   Memcheck:Param
+   socketcall.sendto(msg)
+   fun:send
+   fun:get_mapping
+}