aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2016-03-17 16:17:22 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-25 11:26:59 +0100
commitd114433d6aa18f218d1743af87a6d277587ee776 (patch)
tree573b28904398561640fdc35ee13a346b52d9bc2e /meta-oe/recipes-support
parentb6afa6acd0c9357f31588cf544f196d502c19405 (diff)
downloadmeta-openembedded-d114433d6aa18f218d1743af87a6d277587ee776.tar.gz
poco: update to 1.7.1
Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch35
-rw-r--r--meta-oe/recipes-support/poco/poco_1.7.1.bb (renamed from meta-oe/recipes-support/poco/poco_1.6.1.bb)5
2 files changed, 2 insertions, 38 deletions
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
deleted file mode 100644
index f65bb15406..0000000000
--- a/meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cec5a43151a11d8afbb5dd50caf4e22fb89c6340 Mon Sep 17 00:00:00 2001
-From: Mike Gelfand <mikedld@mikedld.com>
-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 $<TARGET_FILE:Poco::Foundation> 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_1.6.1.bb b/meta-oe/recipes-support/poco/poco_1.7.1.bb
index 9822186d24..135d2aa6c0 100644
--- a/meta-oe/recipes-support/poco/poco_1.6.1.bb
+++ b/meta-oe/recipes-support/poco/poco_1.7.1.bb
@@ -14,12 +14,11 @@ 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"
+SRC_URI[md5sum] = "a4b755d47303b20a0e2586f281d05a36"
+SRC_URI[sha256sum] = "6dbbc2018912ad9af6af96f605933ed91354a1e7423e5dbd04d8e9a2b2d15c05"
S = "${WORKDIR}/poco-poco-${PV}-release"