Re: [oe] [meta-oe][PATCH] poco: Add recipe for POCO C++ library

2016-01-11 Thread Khem Raj 

> On Jan 6, 2016, at 5:14 AM, Pascal Bach  wrote:
> 
> Signed-off-by: Pascal Bach 
> ---
> ...dation-library-version-back-to-SHARED_LIB.patch |  35 +++
> meta-oe/recipes-support/poco/poco/run-ptest|   9 ++
> meta-oe/recipes-support/poco/poco_1.6.1.bb | 108 +
> 3 files changed, 152 insertions(+)
> create mode 100644 
> meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
> create mode 100644 meta-oe/recipes-support/poco/poco/run-ptest
> create mode 100644 meta-oe/recipes-support/poco/poco_1.6.1.bb

meta-ros has a recipe for libpoco
https://github.com/bmwcarit/meta-ros/blob/master/recipes-extended/libpoco/libpoco_1.5.3.bb
Can you coordinate with meta-ros maintainers to migrate it into meta-oe

> 
> diff --git 
> a/meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
>  
> b/meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
> new file mode 100644
> index 000..f65bb15
> --- /dev/null
> +++ 
> b/meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
> @@ -0,0 +1,35 @@
> +From cec5a43151a11d8afbb5dd50caf4e22fb89c6340 Mon Sep 17 00:00:00 2001
> +From: Mike Gelfand 
> +Date: Sun, 20 Sep 2015 03:08:19 +0300
> +Subject: [PATCH] Change Foundation library version back to
> + SHARED_LIBRARY_VERSION
> +
> +Foundation is the only library using PROJECT_VERSION as library version,
> +the change accidentally introduced by commit b69fafb84c. This causes
> +difference in library being linked to (libPocoFoundation.31.dylib on Mac)
> +and library returned by $ for imported
> +target (libPocoFoundation.1.6.1.dylib), causing inconvenience. Also, this
> +differs from autoconf-based builds where only "31" (soversion) library is
> +being created and not "1.6.1" (project version) one.
> +
> +Upstream-Status: Backport from 1.6.2
> +---
> + Foundation/CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
> +index c1dd25f..25f401c 100644
> +--- a/Foundation/CMakeLists.txt
>  b/Foundation/CMakeLists.txt
> +@@ -108,7 +108,7 @@ add_library( "${LIBNAME}" ${LIB_MODE} ${SRCS})
> + add_library( "${POCO_LIBNAME}" ALIAS "${LIBNAME}")
> + set_target_properties( "${LIBNAME}"
> + PROPERTIES
> +-VERSION ${PROJECT_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
> ++VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
> + OUTPUT_NAME ${POCO_LIBNAME}
> + DEFINE_SYMBOL Foundation_EXPORTS
> + )
> +--
> +2.1.4
> +
> diff --git a/meta-oe/recipes-support/poco/poco/run-ptest 
> b/meta-oe/recipes-support/poco/poco/run-ptest
> new file mode 100644
> index 000..c479f7a
> --- /dev/null
> +++ b/meta-oe/recipes-support/poco/poco/run-ptest
> @@ -0,0 +1,9 @@
> +#!/bin/sh
> +while read runner; do
> +  pushd . >/dev/null
> +  cd bin
> +  echo Testing $runner
> +  ./$runner-testrunner -all
> +  popd >/dev/null
> +done < testrunners
> +
> diff --git a/meta-oe/recipes-support/poco/poco_1.6.1.bb 
> b/meta-oe/recipes-support/poco/poco_1.6.1.bb
> new file mode 100644
> index 000..9822186
> --- /dev/null
> +++ b/meta-oe/recipes-support/poco/poco_1.6.1.bb
> @@ -0,0 +1,108 @@
> +SUMMARY = "Modern, powerful open source cross-platform C++ class libraries"
> +DESCRIPTION = "Modern, powerful open source C++ class libraries and 
> frameworks for building network- and internet-based applications that run on 
> desktop, server, mobile and embedded systems."
> +SECTION = "libs"
> +HOMEPAGE = "http://pocoproject.org/;
> +LICENSE = "BSL-1.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
> +
> +# These dependencies are required by Foundation
> +DEPENDS = "libpcre zlib"
> +
> +inherit cmake ptest
> +
> +BBCLASSEXTEND = "native"
> +
> +SRC_URI = " \
> +https://github.com/pocoproject/poco/archive/poco-${PV}-release.tar.gz \
> +file://0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch \
> +file://run-ptest \
> +   "
> +
> +SRC_URI[md5sum] = "208872b13d282dfb0f0580fc11df96f3"
> +SRC_URI[sha256sum] = 
> "08bc0a9bae4fb793eb694ad5ec7742c179bad48a286ae614682483021043658b"
> +
> +S = "${WORKDIR}/poco-poco-${PV}-release"
> +
> +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \
> + ${@bb.utils.contains('PTEST_ENABLED', '1', 
> '-DENABLE_TESTS=ON ', '', d)}"
> +
> +# For the native build we want to use the bundled version
> +EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF"
> +
> +# do not use rpath
> +EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON"
> +
> +# By default the most commonly used poco components are built
> +# Foundation is built anyway and doesn't need to be listed explicitly
> +# these don't have dependencies outside oe-core
>

[oe] [meta-oe][PATCH] poco: Add recipe for POCO C++ library

2016-01-06 Thread Pascal Bach 
Signed-off-by: Pascal Bach 
---
 ...dation-library-version-back-to-SHARED_LIB.patch |  35 +++
 meta-oe/recipes-support/poco/poco/run-ptest|   9 ++
 meta-oe/recipes-support/poco/poco_1.6.1.bb | 108 +
 3 files changed, 152 insertions(+)
 create mode 100644 
meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
 create mode 100644 meta-oe/recipes-support/poco/poco/run-ptest
 create mode 100644 meta-oe/recipes-support/poco/poco_1.6.1.bb

diff --git 
a/meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
 
b/meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
new file mode 100644
index 000..f65bb15
--- /dev/null
+++ 
b/meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
@@ -0,0 +1,35 @@
+From cec5a43151a11d8afbb5dd50caf4e22fb89c6340 Mon Sep 17 00:00:00 2001
+From: Mike Gelfand 
+Date: Sun, 20 Sep 2015 03:08:19 +0300
+Subject: [PATCH] Change Foundation library version back to
+ SHARED_LIBRARY_VERSION
+
+Foundation is the only library using PROJECT_VERSION as library version,
+the change accidentally introduced by commit b69fafb84c. This causes
+difference in library being linked to (libPocoFoundation.31.dylib on Mac)
+and library returned by $ for imported
+target (libPocoFoundation.1.6.1.dylib), causing inconvenience. Also, this
+differs from autoconf-based builds where only "31" (soversion) library is
+being created and not "1.6.1" (project version) one.
+
+Upstream-Status: Backport from 1.6.2
+---
+ Foundation/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
+index c1dd25f..25f401c 100644
+--- a/Foundation/CMakeLists.txt
 b/Foundation/CMakeLists.txt
+@@ -108,7 +108,7 @@ add_library( "${LIBNAME}" ${LIB_MODE} ${SRCS})
+ add_library( "${POCO_LIBNAME}" ALIAS "${LIBNAME}")
+ set_target_properties( "${LIBNAME}"
+ PROPERTIES
+-VERSION ${PROJECT_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
++VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
+ OUTPUT_NAME ${POCO_LIBNAME}
+ DEFINE_SYMBOL Foundation_EXPORTS
+ )
+-- 
+2.1.4
+
diff --git a/meta-oe/recipes-support/poco/poco/run-ptest 
b/meta-oe/recipes-support/poco/poco/run-ptest
new file mode 100644
index 000..c479f7a
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco/run-ptest
@@ -0,0 +1,9 @@
+#!/bin/sh
+while read runner; do
+  pushd . >/dev/null
+  cd bin
+  echo Testing $runner
+  ./$runner-testrunner -all
+  popd >/dev/null
+done < testrunners
+
diff --git a/meta-oe/recipes-support/poco/poco_1.6.1.bb 
b/meta-oe/recipes-support/poco/poco_1.6.1.bb
new file mode 100644
index 000..9822186
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco_1.6.1.bb
@@ -0,0 +1,108 @@
+SUMMARY = "Modern, powerful open source cross-platform C++ class libraries"
+DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks 
for building network- and internet-based applications that run on desktop, 
server, mobile and embedded systems."
+SECTION = "libs"
+HOMEPAGE = "http://pocoproject.org/;
+LICENSE = "BSL-1.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
+
+# These dependencies are required by Foundation
+DEPENDS = "libpcre zlib"
+
+inherit cmake ptest
+
+BBCLASSEXTEND = "native"
+
+SRC_URI = " \
+https://github.com/pocoproject/poco/archive/poco-${PV}-release.tar.gz \
+file://0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch \
+file://run-ptest \
+   "
+
+SRC_URI[md5sum] = "208872b13d282dfb0f0580fc11df96f3"
+SRC_URI[sha256sum] = 
"08bc0a9bae4fb793eb694ad5ec7742c179bad48a286ae614682483021043658b"
+
+S = "${WORKDIR}/poco-poco-${PV}-release"
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \
+ ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON 
', '', d)}"
+
+# For the native build we want to use the bundled version
+EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF"
+
+# do not use rpath
+EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON"
+
+# By default the most commonly used poco components are built
+# Foundation is built anyway and doesn't need to be listed explicitly
+# these don't have dependencies outside oe-core
+PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite 
Zip"
+
+PACKAGECONFIG[XML] = "-DENABLE_XML=ON,-DENABLE_XML=OFF,expat"
+PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF"
+PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF"
+PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib"
+PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF"
+PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF"
+PACKAGECONFIG[NetSSL] =