summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
1From cec5a43151a11d8afbb5dd50caf4e22fb89c6340 Mon Sep 17 00:00:00 2001
2From: Mike Gelfand <mikedld@mikedld.com>
3Date: Sun, 20 Sep 2015 03:08:19 +0300
4Subject: [PATCH] Change Foundation library version back to
5 SHARED_LIBRARY_VERSION
6
7Foundation is the only library using PROJECT_VERSION as library version,
8the change accidentally introduced by commit b69fafb84c. This causes
9difference in library being linked to (libPocoFoundation.31.dylib on Mac)
10and library returned by $<TARGET_FILE:Poco::Foundation> for imported
11target (libPocoFoundation.1.6.1.dylib), causing inconvenience. Also, this
12differs from autoconf-based builds where only "31" (soversion) library is
13being created and not "1.6.1" (project version) one.
14
15Upstream-Status: Backport from 1.6.2
16---
17 Foundation/CMakeLists.txt | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
21index c1dd25f..25f401c 100644
22--- a/Foundation/CMakeLists.txt
23+++ b/Foundation/CMakeLists.txt
24@@ -108,7 +108,7 @@ add_library( "${LIBNAME}" ${LIB_MODE} ${SRCS})
25 add_library( "${POCO_LIBNAME}" ALIAS "${LIBNAME}")
26 set_target_properties( "${LIBNAME}"
27 PROPERTIES
28- VERSION ${PROJECT_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
29+ VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
30 OUTPUT_NAME ${POCO_LIBNAME}
31 DEFINE_SYMBOL Foundation_EXPORTS
32 )
33--
342.1.4
35
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"
14 14
15SRC_URI = " \ 15SRC_URI = " \
16 https://github.com/pocoproject/poco/archive/poco-${PV}-release.tar.gz \ 16 https://github.com/pocoproject/poco/archive/poco-${PV}-release.tar.gz \
17 file://0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch \
18 file://run-ptest \ 17 file://run-ptest \
19 " 18 "
20 19
21SRC_URI[md5sum] = "208872b13d282dfb0f0580fc11df96f3" 20SRC_URI[md5sum] = "a4b755d47303b20a0e2586f281d05a36"
22SRC_URI[sha256sum] = "08bc0a9bae4fb793eb694ad5ec7742c179bad48a286ae614682483021043658b" 21SRC_URI[sha256sum] = "6dbbc2018912ad9af6af96f605933ed91354a1e7423e5dbd04d8e9a2b2d15c05"
23 22
24S = "${WORKDIR}/poco-poco-${PV}-release" 23S = "${WORKDIR}/poco-poco-${PV}-release"
25 24