tags 672091 + patch
thanks
uploaded to delayed/5, part of the boost transition
diff -Nru qpid-cpp-0.14/debian/changelog qpid-cpp-0.14/debian/changelog
--- qpid-cpp-0.14/debian/changelog 2012-02-01 06:51:38.000000000 +0000
+++ qpid-cpp-0.14/debian/changelog 2012-05-10 19:35:59.000000000 +0000
@@ -1,3 +1,11 @@
+qpid-cpp (0.14-2.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7. Closes: #672091.
+ * Build with -Wno-error=cast-qual.
+
+ -- Matthias Klose <d...@debian.org> Thu, 10 May 2012 21:04:21 +0200
+
qpid-cpp (0.14-2) unstable; urgency=low
* Create missing spool directory.
diff -Nru qpid-cpp-0.14/debian/patches/ftbfs-gcc-4.7.diff
qpid-cpp-0.14/debian/patches/ftbfs-gcc-4.7.diff
--- qpid-cpp-0.14/debian/patches/ftbfs-gcc-4.7.diff 1970-01-01
00:00:00.000000000 +0000
+++ qpid-cpp-0.14/debian/patches/ftbfs-gcc-4.7.diff 2012-05-10
19:49:55.000000000 +0000
@@ -0,0 +1,65 @@
+Index: qpid-cpp-0.14/configure.ac
+===================================================================
+--- qpid-cpp-0.14.orig/configure.ac 2011-06-07 19:32:01.000000000 +0000
++++ qpid-cpp-0.14/configure.ac 2012-05-10 19:04:10.466148260 +0000
+@@ -110,10 +110,12 @@
+ # For libraries (libcommon) that use dlopen, dlerror, etc.,
+ # test whether we need to link with -ldl.
+ gl_saved_libs=$LIBS
++ AC_LANG_PUSH(C)
+ AC_SEARCH_LIBS(dlopen, [dl],
+ [test "$ac_cv_search_dlopen" = "none required" ||
+ LIB_DLOPEN=$ac_cv_search_dlopen])
+ AC_SUBST([LIB_DLOPEN])
++ AC_LANG_POP(C)
+ LIBS=$gl_saved_libs
+
+ gl_CLOCK_TIME
+Index: qpid-cpp-0.14/src/qpid/sys/posix/Socket.cpp
+===================================================================
+--- qpid-cpp-0.14.orig/src/qpid/sys/posix/Socket.cpp 2011-08-17
22:07:36.000000000 +0000
++++ qpid-cpp-0.14/src/qpid/sys/posix/Socket.cpp 2012-05-10
19:33:05.950187441 +0000
+@@ -34,6 +34,7 @@
+ #include <netdb.h>
+ #include <cstdlib>
+ #include <string.h>
++#include <unistd.h>
+
+ namespace qpid {
+ namespace sys {
+Index: qpid-cpp-0.14/src/qpid/sys/posix/SocketAddress.cpp
+===================================================================
+--- qpid-cpp-0.14.orig/src/qpid/sys/posix/SocketAddress.cpp 2011-08-17
22:07:36.000000000 +0000
++++ qpid-cpp-0.14/src/qpid/sys/posix/SocketAddress.cpp 2012-05-10
19:33:51.666188418 +0000
+@@ -28,6 +28,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <string.h>
++#include <unistd.h>
+
+ namespace qpid {
+ namespace sys {
+Index: qpid-cpp-0.14/src/qpid/sys/Shlib.h
+===================================================================
+--- qpid-cpp-0.14.orig/src/qpid/sys/Shlib.h 2009-03-12 20:55:34.000000000
+0000
++++ qpid-cpp-0.14/src/qpid/sys/Shlib.h 2012-05-10 19:49:00.390209928 +0000
+@@ -25,6 +25,7 @@
+ #include "qpid/CommonImportExport.h"
+ #include <boost/noncopyable.hpp>
+ #include <iostream>
++#include <unistd.h>
+
+ namespace qpid {
+ namespace sys {
+Index: qpid-cpp-0.14/src/qpid/sys/posix/SystemInfo.cpp
+===================================================================
+--- qpid-cpp-0.14.orig/src/qpid/sys/posix/SystemInfo.cpp 2010-05-11
14:39:58.000000000 +0000
++++ qpid-cpp-0.14/src/qpid/sys/posix/SystemInfo.cpp 2012-05-10
19:49:52.694210043 +0000
+@@ -32,6 +32,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <netdb.h>
++#include <unistd.h>
+
+ #ifndef HOST_NAME_MAX
+ # define HOST_NAME_MAX 256
diff -Nru qpid-cpp-0.14/debian/patches/series
qpid-cpp-0.14/debian/patches/series
--- qpid-cpp-0.14/debian/patches/series 2012-01-17 07:11:34.000000000 +0000
+++ qpid-cpp-0.14/debian/patches/series 2012-05-10 18:55:12.000000000 +0000
@@ -6,3 +6,4 @@
fix-unused.patch
fix-armel-compilation.patch
sasldb-location.patch
+ftbfs-gcc-4.7.diff
diff -Nru qpid-cpp-0.14/debian/rules qpid-cpp-0.14/debian/rules
--- qpid-cpp-0.14/debian/rules 2012-01-19 09:03:29.000000000 +0000
+++ qpid-cpp-0.14/debian/rules 2012-05-10 19:45:17.000000000 +0000
@@ -11,12 +11,14 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -Wno-error=cast-qual
+
# Set install ruby locations for configure
export RUBY_LIB = $(shell ruby1.8 -r rbconfig -e 'print
Config::CONFIG["rubylibdir"]')
export RUBY_LIB_ARCH = $(shell ruby1.8 -r rbconfig -e 'print
Config::CONFIG["archdir"]')
override_dh_auto_configure:
- dh_auto_configure -- --with-sasl --with-xml --with-rdma --with-ssl
--with-cpg --with-swig --libexecdir='/usr/lib'
+ CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --with-sasl --with-xml
--with-rdma --with-ssl --with-cpg --with-swig --libexecdir='/usr/lib'
override_dh_auto_test:
# do not test
