Author: gsim
Date: Wed Jul 30 11:25:14 2008
New Revision: 681164

URL: http://svn.apache.org/viewvc?rev=681164&view=rev
Log:
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.


Added:
    incubator/qpid/trunk/qpid/cpp/boost-1.32-support/
    incubator/qpid/trunk/qpid/cpp/boost-1.32-support/Makefile
    incubator/qpid/trunk/qpid/cpp/boost-1.32-support/README
    incubator/qpid/trunk/qpid/cpp/boost-1.32-support/boost.tar.gz   (with props)
    incubator/qpid/trunk/qpid/cpp/boost-1.32-support/main.patch

Added: incubator/qpid/trunk/qpid/cpp/boost-1.32-support/Makefile
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/boost-1.32-support/Makefile?rev=681164&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/boost-1.32-support/Makefile (added)
+++ incubator/qpid/trunk/qpid/cpp/boost-1.32-support/Makefile Wed Jul 30 
11:25:14 2008
@@ -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

Added: incubator/qpid/trunk/qpid/cpp/boost-1.32-support/README
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/boost-1.32-support/README?rev=681164&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/boost-1.32-support/README (added)
+++ incubator/qpid/trunk/qpid/cpp/boost-1.32-support/README Wed Jul 30 11:25:14 
2008
@@ -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.

Added: incubator/qpid/trunk/qpid/cpp/boost-1.32-support/boost.tar.gz
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/boost-1.32-support/boost.tar.gz?rev=681164&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/qpid/trunk/qpid/cpp/boost-1.32-support/boost.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/qpid/trunk/qpid/cpp/boost-1.32-support/main.patch
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/boost-1.32-support/main.patch?rev=681164&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/boost-1.32-support/main.patch (added)
+++ incubator/qpid/trunk/qpid/cpp/boost-1.32-support/main.patch Wed Jul 30 
11:25:14 2008
@@ -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)


Reply via email to