[commoncpp2] version bump 1.7.3 -> 1.8.0

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

5 files changed, 206 insertions, 4 deletions

diff --git a/patches/commoncpp2-1.7.3/series b/patches/commoncpp2-1.7.3/series
deleted file mode 100644
index 43cfa3a0d..000000000
--- a/patches/commoncpp2-1.7.3/series
+++ /dev/null
@@ -1 +0,0 @@
-src_ccgnu2-config_in-sysroot-fix.diff
diff --git a/patches/commoncpp2-1.8.0/abort-needs-cstdlib.diff b/patches/commoncpp2-1.8.0/abort-needs-cstdlib.diff
new file mode 100644
index 000000000..394c5c529
--- /dev/null
+++ b/patches/commoncpp2-1.8.0/abort-needs-cstdlib.diff
@@ -0,0 +1,67 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+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 <r.schwebel@pengutronix.de>
+---
+# 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 <cc++/slog.h>
+ #include <iostream>
+ #include <cerrno>
++#include <cstdlib>
+ 
+ #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 <cc++/thread.h>
+ #include "private.h"
+ #include <cstdio>
++#include <cstdlib>
+ 
+ #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 <cc++/slog.h>
+ #include <cc++/thread.h>
+ #include <cc++/misc.h>
++#include <cstdlib>
+ #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 <cc++/config.h>
+ #include <cc++/string.h>
+ #include <cc++/exception.h>
++#include <cstdlib>
+ 
+ #if !defined(_MSC_VER) || _MSC_VER >= 1300
+ 
diff --git a/patches/commoncpp2-1.8.0/series b/patches/commoncpp2-1.8.0/series
new file mode 100644
index 000000000..5e8db52f4
--- /dev/null
+++ b/patches/commoncpp2-1.8.0/series
@@ -0,0 +1,3 @@
+src_ccgnu2-config_in-sysroot-fix.diff
+abort-needs-cstdlib.diff
+throw-wrapper.diff
diff --git a/patches/commoncpp2-1.7.3/src_ccgnu2-config_in-sysroot-fix.diff b/patches/commoncpp2-1.8.0/src_ccgnu2-config_in-sysroot-fix.diff
index c0213c33e..51b74a3aa 100644
--- a/patches/commoncpp2-1.7.3/src_ccgnu2-config_in-sysroot-fix.diff
+++ b/patches/commoncpp2-1.8.0/src_ccgnu2-config_in-sysroot-fix.diff
@@ -9,10 +9,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  src/ccgnu2-config.in |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-Index: commoncpp2-1.7.3/src/ccgnu2-config.in
+Index: commoncpp2-1.8.0/src/ccgnu2-config.in
 ===================================================================
---- commoncpp2-1.7.3.orig/src/ccgnu2-config.in
-+++ commoncpp2-1.7.3/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@"
diff --git a/patches/commoncpp2-1.8.0/throw-wrapper.diff b/patches/commoncpp2-1.8.0/throw-wrapper.diff
new file mode 100644
index 000000000..549e22ec2
--- /dev/null
+++ b/patches/commoncpp2-1.8.0/throw-wrapper.diff
@@ -0,0 +1,133 @@
+Subject: [PATCH] Fix --without-exceptions
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+
+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 <r.schwebel@pengutronix.de>
+---
+# 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 <iomanip>
+ #include <iostream>
+ #include <cstdio>
++#include <cstdlib>
+ #include <stdarg.h>
+ #include <errno.h>
+ 
+@@ -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();
+ }