diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-13 20:01:48 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-14 11:01:25 +0100 |
| commit | d1bf322af4e8eea8dad8a62cc937ceb817f898b7 (patch) | |
| tree | c9dfc5f177a49b753cef355a28cb71dfafcd7144 /patches/commoncpp2-1.8.1 | |
| parent | 6feaf40c564641ff6240bfc146f6fadf17d72c83 (diff) | |
| download | ptxdist-d1bf322af4e8eea8dad8a62cc937ceb817f898b7.tar.gz ptxdist-d1bf322af4e8eea8dad8a62cc937ceb817f898b7.tar.xz | |
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 <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/commoncpp2-1.8.1')
| -rw-r--r-- | patches/commoncpp2-1.8.1/0001-Add-SYSROOT-capability.patch | 45 | ||||
| -rw-r--r-- | patches/commoncpp2-1.8.1/0002-Added-missing-include-gcc-4.5.1-error.patch | 35 | ||||
| -rw-r--r-- | patches/commoncpp2-1.8.1/series | 4 |
3 files changed, 84 insertions, 0 deletions
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 <mkl@pengutronix.de> +Date: Sun, 13 Feb 2011 19:59:43 +0100 +Subject: [PATCH] Add ${SYSROOT} capability + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +# 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 <m.olbrich@pengutronix.de> +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 <m.olbrich@pengutronix.de> +--- + 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 <cc++/thread.h> + #include <cc++/slog.h> + #include <cc++/buffer.h> ++#ifndef WIN32 ++#include <sys/types.h> ++#include <sys/stat.h> ++#endif + #include <string> + #include <iomanip> + #include <iostream> +-- +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 |