diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2016-03-17 16:17:22 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-25 11:26:59 +0100 |
commit | d114433d6aa18f218d1743af87a6d277587ee776 (patch) | |
tree | 573b28904398561640fdc35ee13a346b52d9bc2e /meta-oe/recipes-support/poco | |
parent | b6afa6acd0c9357f31588cf544f196d502c19405 (diff) | |
download | meta-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/poco')
-rw-r--r-- | meta-oe/recipes-support/poco/poco-1.6.1/0001-Change-Foundation-library-version-back-to-SHARED_LIB.patch | 35 | ||||
-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 f65bb1540..000000000 --- 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 @@ | |||
1 | From cec5a43151a11d8afbb5dd50caf4e22fb89c6340 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mike Gelfand <mikedld@mikedld.com> | ||
3 | Date: Sun, 20 Sep 2015 03:08:19 +0300 | ||
4 | Subject: [PATCH] Change Foundation library version back to | ||
5 | SHARED_LIBRARY_VERSION | ||
6 | |||
7 | Foundation is the only library using PROJECT_VERSION as library version, | ||
8 | the change accidentally introduced by commit b69fafb84c. This causes | ||
9 | difference in library being linked to (libPocoFoundation.31.dylib on Mac) | ||
10 | and library returned by $<TARGET_FILE:Poco::Foundation> for imported | ||
11 | target (libPocoFoundation.1.6.1.dylib), causing inconvenience. Also, this | ||
12 | differs from autoconf-based builds where only "31" (soversion) library is | ||
13 | being created and not "1.6.1" (project version) one. | ||
14 | |||
15 | Upstream-Status: Backport from 1.6.2 | ||
16 | --- | ||
17 | Foundation/CMakeLists.txt | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt | ||
21 | index 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 | -- | ||
34 | 2.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 9822186d2..135d2aa6c 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 | ||
15 | SRC_URI = " \ | 15 | SRC_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 | ||
21 | SRC_URI[md5sum] = "208872b13d282dfb0f0580fc11df96f3" | 20 | SRC_URI[md5sum] = "a4b755d47303b20a0e2586f281d05a36" |
22 | SRC_URI[sha256sum] = "08bc0a9bae4fb793eb694ad5ec7742c179bad48a286ae614682483021043658b" | 21 | SRC_URI[sha256sum] = "6dbbc2018912ad9af6af96f605933ed91354a1e7423e5dbd04d8e9a2b2d15c05" |
23 | 22 | ||
24 | S = "${WORKDIR}/poco-poco-${PV}-release" | 23 | S = "${WORKDIR}/poco-poco-${PV}-release" |
25 | 24 | ||