From d1bf322af4e8eea8dad8a62cc937ceb817f898b7 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sun, 13 Feb 2011 20:01:48 +0100 Subject: commoncpp2: version bump 1.8.0 -> 1.8.1 also add upstream patch to fix building with gcc 4.5 Signed-off-by: Michael Olbrich --- patches/commoncpp2-1.8.0/abort-needs-cstdlib.diff | 67 ----------- patches/commoncpp2-1.8.0/series | 3 - .../src_ccgnu2-config_in-sysroot-fix.diff | 42 ------- patches/commoncpp2-1.8.0/throw-wrapper.diff | 133 --------------------- .../0001-Add-SYSROOT-capability.patch | 45 +++++++ ...002-Added-missing-include-gcc-4.5.1-error.patch | 35 ++++++ patches/commoncpp2-1.8.1/series | 4 + 7 files changed, 84 insertions(+), 245 deletions(-) delete mode 100644 patches/commoncpp2-1.8.0/abort-needs-cstdlib.diff delete mode 100644 patches/commoncpp2-1.8.0/series delete mode 100644 patches/commoncpp2-1.8.0/src_ccgnu2-config_in-sysroot-fix.diff delete mode 100644 patches/commoncpp2-1.8.0/throw-wrapper.diff create mode 100644 patches/commoncpp2-1.8.1/0001-Add-SYSROOT-capability.patch create mode 100644 patches/commoncpp2-1.8.1/0002-Added-missing-include-gcc-4.5.1-error.patch create mode 100644 patches/commoncpp2-1.8.1/series (limited to 'patches') diff --git a/patches/commoncpp2-1.8.0/abort-needs-cstdlib.diff b/patches/commoncpp2-1.8.0/abort-needs-cstdlib.diff deleted file mode 100644 index 394c5c529..000000000 --- a/patches/commoncpp2-1.8.0/abort-needs-cstdlib.diff +++ /dev/null @@ -1,67 +0,0 @@ -From: Robert Schwebel -Subject: [PATCH] abort needs cstdlib - -Fix this compile error when compiled --without-exceptions: - -libtool: compile: arm-1136jfs-linux-gnueabi-g++ -DHAVE_CONFIG_H -I. -I.. -I../inc -isystem /home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/sysroot-target/include -isystem /home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/sysroot-target/usr/include -I../src -DCCXX_EXPORT_LIBRARY -D_GNU_SOURCE -fno-exceptions -fno-rtti -fno-check-new -finline -I../inc -g -O2 -MT mutex.lo -MD -MP -MF .deps/mutex.Tpo -c mutex.cpp -fPIC -DPIC -o .libs/mutex.o -mutex.cpp: In constructor 'ost::Conditional::Conditional(const char*)': -mutex.cpp:145: error: 'abort' was not declared in this scope - -Signed-off-by: Robert Schwebel ---- -# rsc: https://savannah.gnu.org/patch/index.php?7198 - - src/engine.cpp | 1 + - src/mempager.cpp | 1 + - src/mutex.cpp | 1 + - src/semaphore.cpp | 1 + - 4 files changed, 4 insertions(+) - -Index: commoncpp2-1.8.0/src/mutex.cpp -=================================================================== ---- commoncpp2-1.8.0.orig/src/mutex.cpp -+++ commoncpp2-1.8.0/src/mutex.cpp -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_GCC_CXX_BITS_ATOMIC - using namespace __gnu_cxx; -Index: commoncpp2-1.8.0/src/semaphore.cpp -=================================================================== ---- commoncpp2-1.8.0.orig/src/semaphore.cpp -+++ commoncpp2-1.8.0/src/semaphore.cpp -@@ -42,6 +42,7 @@ - #include - #include "private.h" - #include -+#include - - #ifdef CCXX_NAMESPACES - namespace ost { -Index: commoncpp2-1.8.0/src/mempager.cpp -=================================================================== ---- commoncpp2-1.8.0.orig/src/mempager.cpp -+++ commoncpp2-1.8.0/src/mempager.cpp -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include "private.h" - - #ifdef CCXX_NAMESPACES -Index: commoncpp2-1.8.0/src/engine.cpp -=================================================================== ---- commoncpp2-1.8.0.orig/src/engine.cpp -+++ commoncpp2-1.8.0/src/engine.cpp -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #if !defined(_MSC_VER) || _MSC_VER >= 1300 - diff --git a/patches/commoncpp2-1.8.0/series b/patches/commoncpp2-1.8.0/series deleted file mode 100644 index 5e8db52f4..000000000 --- a/patches/commoncpp2-1.8.0/series +++ /dev/null @@ -1,3 +0,0 @@ -src_ccgnu2-config_in-sysroot-fix.diff -abort-needs-cstdlib.diff -throw-wrapper.diff diff --git a/patches/commoncpp2-1.8.0/src_ccgnu2-config_in-sysroot-fix.diff b/patches/commoncpp2-1.8.0/src_ccgnu2-config_in-sysroot-fix.diff deleted file mode 100644 index 51b74a3aa..000000000 --- a/patches/commoncpp2-1.8.0/src_ccgnu2-config_in-sysroot-fix.diff +++ /dev/null @@ -1,42 +0,0 @@ -From: Marc Kleine-Budde -Subject: Add ${SYSROOT} capability - -Signed-off-by: Marc Kleine-Budde - ---- -# rsc: https://savannah.gnu.org/patch/index.php?6971 - - src/ccgnu2-config.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: commoncpp2-1.8.0/src/ccgnu2-config.in -=================================================================== ---- commoncpp2-1.8.0.orig/src/ccgnu2-config.in -+++ commoncpp2-1.8.0/src/ccgnu2-config.in -@@ -18,7 +18,7 @@ ccload="@DYN_LOADER@" - ccstd="@SSL_LIBS@ @ZSTREAM_LIBS@" - prefix="@prefix@" - exec_prefix="@exec_prefix@" --libdir="-L@libdir@" -+libdir="-L${SYSROOT}@libdir@" - - includedir="@includedir@" - -@@ -48,7 +48,7 @@ fi - while test $# -gt 0 ; do - case "$1" in - --prefix) -- echo @prefix@ -+ echo ${SYSROOT}@prefix@ - ;; - --version) - echo @VERSION@ -@@ -72,7 +72,7 @@ while test $# -gt 0 ; do - echo -lccext2 $ccstd - ;; - --includes) -- echo -I$includedir -+ echo -I${SYSROOT}$includedir - ;; - --dyn | --dso) - echo $ost_cv_dynloader diff --git a/patches/commoncpp2-1.8.0/throw-wrapper.diff b/patches/commoncpp2-1.8.0/throw-wrapper.diff deleted file mode 100644 index 549e22ec2..000000000 --- a/patches/commoncpp2-1.8.0/throw-wrapper.diff +++ /dev/null @@ -1,133 +0,0 @@ -Subject: [PATCH] Fix --without-exceptions -From: Robert Schwebel - -If built --without-exceptions, use the THROW() macro instead of calling -throw directly. The files that use THROW() do also have to include -cstdlib. Fixes a bunch of compile errors. - -Signed-of-by: Robert Schwebel ---- -# rsc: https://savannah.gnu.org/patch/index.php?7199 - - inc/cc++/applog.h | 2 ++ - src/applog.cpp | 19 ++++++++++--------- - src/socket.cpp | 4 ++-- - 3 files changed, 14 insertions(+), 11 deletions(-) - -Index: commoncpp2-1.8.0/src/socket.cpp -=================================================================== ---- commoncpp2-1.8.0.orig/src/socket.cpp -+++ commoncpp2-1.8.0/src/socket.cpp -@@ -581,13 +581,13 @@ Socket::Error Socket::error(Error err, c - #ifdef CCXX_EXCEPTIONS - switch(Thread::getException()) { - case Thread::throwObject: -- throw((Socket *)this); -+ THROW((Socket *)this); - #ifdef COMMON_STD_EXCEPTION - case Thread::throwException: - { - if(!errs) - errs = (char *)""; -- throw SockException(String(errs), err, systemError); -+ THROW(SockException(String(errs), err, systemError)); - } - #endif - case Thread::throwNothing: -Index: commoncpp2-1.8.0/inc/cc++/applog.h -=================================================================== ---- commoncpp2-1.8.0.orig/inc/cc++/applog.h -+++ commoncpp2-1.8.0/inc/cc++/applog.h -@@ -123,6 +123,7 @@ class __EXPORT HEXdump - - }; - -+#ifdef CCXX_EXCEPTIONS - /** - * Applog exception, used for memory problems at the moment - * -@@ -137,6 +138,7 @@ class __EXPORT AppLogException : public - AppLogException(const std::string &what_arg) : ost::Exception(what_arg) {}; - - }; -+#endif - - class AppLogPrivate; - -Index: commoncpp2-1.8.0/src/applog.cpp -=================================================================== ---- commoncpp2-1.8.0.orig/src/applog.cpp -+++ commoncpp2-1.8.0/src/applog.cpp -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -301,11 +302,11 @@ logger::logger(const char* logFileName, - _logfs.open(_nomeFile.c_str(), std::fstream::in | std::fstream::out); - } - else -- throw AppLogException("Can't create pipe"); -+ THROW(AppLogException("Can't create pipe")); - } - #endif - if (_logfs.fail()) -- throw AppLogException("Can't open log file name"); -+ THROW(AppLogException("Can't open log file name")); - } - } - -@@ -346,11 +347,11 @@ void logger::logFileName(const char* Fil - _logfs.open(_nomeFile.c_str(), std::fstream::in | std::fstream::out); - } - else -- throw AppLogException("Can't create pipe"); -+ THROW(AppLogException("Can't create pipe")); - } - #endif - if (_logfs.fail()) -- throw AppLogException("Can't open log file name"); -+ THROW(AppLogException("Can't open log file name")); - } - - } -@@ -407,7 +408,7 @@ AppLog::AppLog(const char* logFileName, - d= NULL; // pedantic fussy about initing members before base classes... - d = new AppLogPrivate(); - if (!d) -- throw AppLogException("Memory allocation problem"); -+ THROW(AppLogException("Memory allocation problem")); - - d->_nomeFile = ""; - d->_logDirectly = logDirectly; -@@ -460,11 +461,11 @@ AppLog::AppLog(const char* logFileName, - d->_logfs.open(d->_nomeFile.c_str(), std::fstream::in | std::fstream::out); - } - else -- throw AppLogException("Can't create pipe"); -+ THROW(AppLogException("Can't create pipe")); - } - #endif - if (d->_logfs.fail()) -- throw AppLogException("Can't open log file name"); -+ THROW(AppLogException("Can't open log file name")); - } - - //from Error level on write to syslog also -@@ -562,11 +563,11 @@ void AppLog::logFileName(const char* Fil - d->_logfs.open(d->_nomeFile.c_str(), std::fstream::in | std::fstream::out); - } - else -- throw AppLogException("Can't create pipe"); -+ THROW(AppLogException("Can't create pipe")); - } - #endif - if (d->_logfs.fail()) -- throw AppLogException("Can't open log file name"); -+ THROW(AppLogException("Can't open log file name")); - } - d->_lock.leaveMutex(); - } diff --git a/patches/commoncpp2-1.8.1/0001-Add-SYSROOT-capability.patch b/patches/commoncpp2-1.8.1/0001-Add-SYSROOT-capability.patch new file mode 100644 index 000000000..d768aa99e --- /dev/null +++ b/patches/commoncpp2-1.8.1/0001-Add-SYSROOT-capability.patch @@ -0,0 +1,45 @@ +From: Marc Kleine-Budde +Date: Sun, 13 Feb 2011 19:59:43 +0100 +Subject: [PATCH] Add ${SYSROOT} capability + +Signed-off-by: Marc Kleine-Budde + +# rsc: https://savannah.gnu.org/patch/index.php?6971 +--- + src/ccgnu2-config.in | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ccgnu2-config.in b/src/ccgnu2-config.in +index 9fcafc9..9da0366 100755 +--- a/src/ccgnu2-config.in ++++ b/src/ccgnu2-config.in +@@ -18,7 +18,7 @@ ccload="@DYN_LOADER@" + ccstd="@SSL_LIBS@ @ZSTREAM_LIBS@" + prefix="@prefix@" + exec_prefix="@exec_prefix@" +-libdir="-L@libdir@" ++libdir="-L${SYSROOT}@libdir@" + + includedir="@includedir@" + +@@ -66,7 +66,7 @@ while test $# -gt 0 ; do + libdir="-L$sysroot@libdir@" + ;; + --prefix) +- echo @prefix@ ++ echo ${SYSROOT}@prefix@ + ;; + --exec-prefix=*) + exec_prefix=$optarg +@@ -97,7 +97,7 @@ while test $# -gt 0 ; do + echo -lccext2 $ccstd + ;; + --includes) +- echo -I$includedir ++ echo -I${SYSROOT}$includedir + ;; + --dyn | --dso) + echo $ost_cv_dynloader +-- +1.7.2.3 + diff --git a/patches/commoncpp2-1.8.1/0002-Added-missing-include-gcc-4.5.1-error.patch b/patches/commoncpp2-1.8.1/0002-Added-missing-include-gcc-4.5.1-error.patch new file mode 100644 index 000000000..3516828a8 --- /dev/null +++ b/patches/commoncpp2-1.8.1/0002-Added-missing-include-gcc-4.5.1-error.patch @@ -0,0 +1,35 @@ +From: Michael Olbrich +Date: Sun, 13 Feb 2011 19:59:59 +0100 +Subject: [PATCH] Added missing include (gcc 4.5.1 error) + +applog.cpp: In constructor 'ost::logger::logger(const char*, bool)': +applog.cpp:300:43: error: 'S_IREAD' was not declared in this scope +applog.cpp:300:53: error: 'S_IWRITE' was not declared in this scope +applog.cpp:300:61: error: 'mkfifo' was not declared in this scope +[...] + +this is upstream revision 1570. + +Signed-off-by: Michael Olbrich +--- + src/applog.cpp | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/applog.cpp b/src/applog.cpp +index b5c02b0..71d4e12 100755 +--- a/src/applog.cpp ++++ b/src/applog.cpp +@@ -38,6 +38,10 @@ + #include + #include + #include ++#ifndef WIN32 ++#include ++#include ++#endif + #include + #include + #include +-- +1.7.2.3 + diff --git a/patches/commoncpp2-1.8.1/series b/patches/commoncpp2-1.8.1/series new file mode 100644 index 000000000..b94046022 --- /dev/null +++ b/patches/commoncpp2-1.8.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +0001-Add-SYSROOT-capability.patch +0002-Added-missing-include-gcc-4.5.1-error.patch +# f7347fbf0f5d9a0f521a925693a3028f - git-ptx-patches magic -- cgit v1.2.3