[rhmessaging-commits] rhmessaging commits: r2241 - in store/branches/mrg-1.0/cpp: rhel4-support and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Thu Jul 31 15:02:44 EDT 2008
Author: kpvdr
Date: 2008-07-31 15:02:43 -0400 (Thu, 31 Jul 2008)
New Revision: 2241
Added:
store/branches/mrg-1.0/cpp/rhel4-support/
store/branches/mrg-1.0/cpp/rhel4-support/Makefile
store/branches/mrg-1.0/cpp/rhel4-support/README
store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch
Log:
Added dir for RHEL4 support on 1.0 branch
Added: store/branches/mrg-1.0/cpp/rhel4-support/Makefile
===================================================================
--- store/branches/mrg-1.0/cpp/rhel4-support/Makefile (rev 0)
+++ store/branches/mrg-1.0/cpp/rhel4-support/Makefile 2008-07-31 19:02:43 UTC (rev 2241)
@@ -0,0 +1,7 @@
+.PHONY: default apply
+
+default:
+ @echo "Run 'make apply' to patch the source for RHEL4"
+
+apply: rhel4.patch
+ patch -d .. -p0 < rhel4.patch
Added: store/branches/mrg-1.0/cpp/rhel4-support/README
===================================================================
--- store/branches/mrg-1.0/cpp/rhel4-support/README (rev 0)
+++ store/branches/mrg-1.0/cpp/rhel4-support/README 2008-07-31 19:02:43 UTC (rev 2241)
@@ -0,0 +1,8 @@
+To compile on RHEL4, run:
+
+make apply
+
+This will apply all necessary patches. Change dirs back to cpp
+and run ./bootstrap and ./configure as ususal. Make sure that if
+./configure is run with --with-qpid-checkout, it points to a version
+of qpid which has also been patched for RHEL4.
Added: store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch
===================================================================
--- store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch (rev 0)
+++ store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch 2008-07-31 19:02:43 UTC (rev 2241)
@@ -0,0 +1,276 @@
+Index: tests/.valgrind.supp
+===================================================================
+--- tests/.valgrind.supp (revision 2179)
++++ tests/.valgrind.supp (working copy)
+@@ -1,32 +1,205 @@
+ {
+- Benign error in libcpg.
+- Memcheck:Param
+- socketcall.sendmsg(msg.msg_iov[i])
+- obj:*/libpthread-2.5.so
+- obj:*/libcpg.so.2.0.0
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:_Znwm
++ fun:_ZNSs4_Rep9_S_createEmmRKSaIcE
++ obj:/usr/lib64/libstdc++.so.6.0.3
++ fun:_ZNSsC1EPKcRKSaIcE
++ fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
++ fun:_ZN4qpid3log6LoggerC1Ev
+ }
+-
+ {
+- Uninitialised value problem in _dl_relocate (F7, F8)
+- Memcheck:Cond
+- fun:_dl_relocate_object
+- fun:*dl_*
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:_Znwm
++ fun:_ZNSt6vectorISsSaISsEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPSsS1_EERKSs
++ fun:_ZN4qpid7Options14register_namesESs
++ fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
++ fun:_ZN4qpid3log6LoggerC1Ev
+ }
+-
+ {
+- False "possibly leaked" in boost program_options - global std::string var.
++ <insert a suppression name here>
+ Memcheck:Leak
+- fun:_Znwj
+- fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
+- obj:/usr/lib/libstdc++.so.6.0.8
+- fun:_ZNSsC1EPKcRKSaIcE
+- obj:/usr/lib/libboost_program_options.so.1.33.1
++ fun:_Znwm
++ fun:_ZN5boost15program_options29options_description_easy_initclEPKcPKNS0_14value_semanticES3_
++ fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
++ fun:_ZN4qpid3log6LoggerC1Ev
+ }
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:calloc
++ fun:_dl_allocate_tls
++ fun:pthread_create@@GLIBC_2.2.5
++ fun:_ZN3rhm3jtt13jrnl_instance6run_tcEv
++ fun:_Z13constructor_1v
++ 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
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:_Znwm
++ fun:_ZN5boost9unit_test9test_caseC2ENS0_13basic_cstringIKcEEbmb
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:calloc
++ fun:_dl_allocate_tls
++ fun:pthread_create@@GLIBC_2.2.5
++ fun:_ZN4qpid6broker5Timer5startEv
++ fun:_ZN4qpid6broker5TimerC1Ev
++}
+
+ {
+- Bogus epoll_ctl error on i386
+- Memcheck:Param
+- epoll_ctl(event)
+- fun:epoll_ctl
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:malloc
++ fun:decompose_rpath
++ fun:_dl_map_object
++ fun:openaux
++ fun:_dl_catch_error
++ fun:_dl_map_object_deps
++ fun:dl_open_worker
++ fun:_dl_catch_error
++ fun:_dl_open
++ fun:dlopen_doit
++ fun:_dl_catch_error
++ fun:_dlerror_run
++ fun:dlopen@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys5Shlib4loadEPKc
++ fun:_Z8tryShlibPKcb
++ fun:main
+ }
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:calloc
++ fun:_dlerror_run
++ fun:dlopen@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys5Shlib4loadEPKc
++ fun:_Z8tryShlibPKcb
++ fun:main
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:malloc
++ fun:_dl_map_object
++ fun:openaux
++ fun:_dl_catch_error
++ fun:_dl_map_object_deps
++ fun:dl_open_worker
++ fun:_dl_catch_error
++ fun:_dl_open
++ fun:dlopen_doit
++ fun:_dl_catch_error
++ fun:_dlerror_run
++ fun:dlopen@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys5Shlib4loadEPKc
++ fun:_Z8tryShlibPKcb
++ fun:main
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:malloc
++ fun:expand_dynamic_string_token
++ fun:_dl_map_object
++ fun:dl_open_worker
++ fun:_dl_catch_error
++ fun:_dl_open
++ fun:dlopen_doit
++ fun:_dl_catch_error
++ fun:_dlerror_run
++ fun:dlopen@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys5Shlib4loadEPKc
++ fun:_Z8tryShlibPKcb
++ fun:main
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:malloc
++ fun:_dl_new_object
++ fun:_dl_map_object_from_fd
++ fun:_dl_map_object
++ fun:dl_open_worker
++ fun:_dl_catch_error
++ fun:_dl_open
++ fun:dlopen_doit
++ fun:_dl_catch_error
++ fun:_dlerror_run
++ fun:dlopen@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys5Shlib4loadEPKc
++ fun:_Z8tryShlibPKcb
++ fun:main
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:calloc
++ fun:_dl_new_object
++ fun:_dl_map_object_from_fd
++ fun:_dl_map_object
++ fun:dl_open_worker
++ fun:_dl_catch_error
++ fun:_dl_open
++ fun:dlopen_doit
++ fun:_dl_catch_error
++ fun:_dlerror_run
++ fun:dlopen@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys5Shlib4loadEPKc
++ fun:_Z8tryShlibPKcb
++ fun:main
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:malloc
++ fun:_dl_map_object_deps
++ fun:dl_open_worker
++ fun:_dl_catch_error
++ fun:_dl_open
++ fun:dlopen_doit
++ fun:_dl_catch_error
++ fun:_dlerror_run
++ fun:dlopen@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys5Shlib4loadEPKc
++ fun:_Z8tryShlibPKcb
++ fun:main
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:calloc
++ fun:_dl_check_map_versions
++ fun:dl_open_worker
++ fun:_dl_catch_error
++ fun:_dl_open
++ fun:dlopen_doit
++ fun:_dl_catch_error
++ fun:_dlerror_run
++ fun:dlopen@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys5Shlib4loadEPKc
++ fun:_Z8tryShlibPKcb
++ fun:main
++}
++{
++ <insert a suppression name here>
++ Memcheck:Leak
++ fun:_Znwm
++ fun:_ZN5boost15program_options19options_description3addERKS1_
++ fun:main
++}
+
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 2179)
++++ configure.ac (working copy)
+@@ -54,7 +54,6 @@
+ # -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)
+@@ -63,7 +62,6 @@
+ gl_COMPILER_FLAGS(-Wcast-qual)
+ gl_COMPILER_FLAGS(-Wcast-align)
+ gl_COMPILER_FLAGS(-Wno-long-long)
+- gl_COMPILER_FLAGS(-Wvolatile-register-var)
+ gl_COMPILER_FLAGS(-Winvalid-pch)
+ gl_COMPILER_FLAGS(-Wno-system-headers)
+ AC_SUBST([WARNING_CFLAGS], [$COMPILER_FLAGS])
+Index: lib/BdbMessageStore.cpp
+===================================================================
+--- lib/BdbMessageStore.cpp (revision 2179)
++++ lib/BdbMessageStore.cpp (working copy)
+@@ -224,10 +224,6 @@
+ try {
+ env.open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON, 0);
+ } catch (const DbException& e) {
+- if (e.get_errno() == DB_VERSION_MISMATCH)
+- THROW_STORE_EXCEPTION_2("Database environment mismatch: This version of bd4 does not match that which created the store database. "
+- "(If recovery is not important, delete the contents of the store directory. Otherwise, try upgrading the database using "
+- "db_upgrade or using db_recover - but the db4-utils package must also be installed to use these utilities.)", e);
+ THROW_STORE_EXCEPTION_2("Error opening environment", e);
+ }
+
+Index: Makefile.am
+===================================================================
+--- Makefile.am (revision 2179)
++++ Makefile.am (working copy)
+@@ -1,4 +1,4 @@
+-AUTOMAKE_OPTIONS = 1.9.6 foreign
++AUTOMAKE_OPTIONS = 1.9.2 foreign
+ ACLOCAL_AMFLAGS = -I m4
+
+ EXTRA_DIST = README etc/rhmd.conf
More information about the rhmessaging-commits
mailing list