summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2008-08-12 20:12:04 +0000
committerGordon Sim <gsim@apache.org>2008-08-12 20:12:04 +0000
commite72b261cb7f9c24cff62cd256c2aab4ce56e4a46 (patch)
tree392d7baeb9590d13a05cc81a8e3c92866deb3820
parentc4c87ff4b6972f0281c63a0f75e7df3c0e572353 (diff)
downloadqpid-python-e72b261cb7f9c24cff62cd256c2aab4ce56e4a46.tar.gz
Add extra boost headers to dist tarball
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@685289 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/boost-1.32-support/main.patch48
1 files changed, 24 insertions, 24 deletions
diff --git a/cpp/boost-1.32-support/main.patch b/cpp/boost-1.32-support/main.patch
index 16e1d31270..0d1e1e9d0a 100644
--- a/cpp/boost-1.32-support/main.patch
+++ b/cpp/boost-1.32-support/main.patch
@@ -1,18 +1,18 @@
--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)
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 685281)
++++ 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)
Index: src/tests/.valgrind.supp
===================================================================
---- src/tests/.valgrind.supp (revision 683578)
+--- src/tests/.valgrind.supp (revision 685281)
+++ src/tests/.valgrind.supp (working copy)
@@ -193,8 +193,116 @@
}
@@ -132,15 +132,15 @@ Index: src/tests/.valgrind.supp
socketcall.sendmsg(msg.msg_iov[i])
fun:sendmsg
obj:/usr/lib/openais/libcpg.so.2.0.0
-Index: configure.ac
+Index: src/Makefile.am
===================================================================
---- configure.ac (revision 683578)
-+++ 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)
+--- src/Makefile.am (revision 685281)
++++ src/Makefile.am (working copy)
+@@ -1,6 +1,6 @@
+ SUBDIRS = . tests
+
+-EXTRA_DIST= $(platform_dist) $(rgen_srcs)
++EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(top_srcdir)/src/boost
+
+ ## Generated code
+