From 168ddc675f724bcd90b90f34a65770cb8493b85f Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Mon, 4 Aug 2014 07:07:04 +0200 Subject: [PATCH] libpoco: updating to 1.5.3 This commit updates to version 1.5.3 and removes the local patch that has been merged in version 1.5.3. --- ...for-CONFIGURE_FILE-in-CMakeLists.txt.patch | 42 ------------------- .../{libpoco_1.5.2.bb => libpoco_1.5.3.bb} | 8 ++-- 2 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 recipes-extended/libpoco/libpoco/0001-correct-path-for-CONFIGURE_FILE-in-CMakeLists.txt.patch rename recipes-extended/libpoco/{libpoco_1.5.2.bb => libpoco_1.5.3.bb} (53%) diff --git a/recipes-extended/libpoco/libpoco/0001-correct-path-for-CONFIGURE_FILE-in-CMakeLists.txt.patch b/recipes-extended/libpoco/libpoco/0001-correct-path-for-CONFIGURE_FILE-in-CMakeLists.txt.patch deleted file mode 100644 index 77661ce..0000000 --- a/recipes-extended/libpoco/libpoco/0001-correct-path-for-CONFIGURE_FILE-in-CMakeLists.txt.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ee7e02737b599d90f628252202e5a9969d050f5e Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Sat, 1 Mar 2014 16:32:32 +0100 -Subject: [PATCH] correct path for CONFIGURE_FILE in CMakeLists.txt - -If CMAKE_MODULE_PATH is empty before appending -'${CMAKE_CURRENT_SOURCE_DIR}/cmake' to it (CMakeLists.txt:27), -CONFIGURE_FILE (CMakeLists.txt:182) works as intended. -However, when CMAKE_MODULE_PATH is not empty, e.g., because of -further tool-chain settings, CONFIGURE_FILE fails with: - -CMake Error: File ;/cmake/cmake_uninstall.cmake.in does not exist. -| CMake Error at CMakeLists.txt:182 (CONFIGURE_FILE): -| configure_file Problem configuring file - -This commit addresses this problem by only using -'${CMAKE_CURRENT_SOURCE_DIR}/cmake' in CONFIGURE_FILE. -The problem was discovered in the meta-ros layer project -(http://github.com/bmwcarit/meta-ros) when creating a libpoco -bitbake recipe, which uses poco's cmake installation scripts. - -Signed-off-by: Lukas Bulwahn ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d02f13..1c9f523 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -180,7 +180,7 @@ endif(APRUTIL_FOUND AND APACHE_FOUND) - ############################################################# - # Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ - CONFIGURE_FILE( -- "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in" -+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) - --- -1.8.3.1 - diff --git a/recipes-extended/libpoco/libpoco_1.5.2.bb b/recipes-extended/libpoco/libpoco_1.5.3.bb similarity index 53% rename from recipes-extended/libpoco/libpoco_1.5.2.bb rename to recipes-extended/libpoco/libpoco_1.5.3.bb index c91ae8e..df9c959 100644 --- a/recipes-extended/libpoco/libpoco_1.5.2.bb +++ b/recipes-extended/libpoco/libpoco_1.5.3.bb @@ -1,15 +1,13 @@ DESCRIPTION = "POCO C++ Libraries" HOMEPAGE = "http://pocoproject.org" LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" DEPENDS = "expat zlib libpcre openssl" SRC_URI = "https://github.com/pocoproject/poco/archive/poco-${PV}-release.tar.gz" -SRC_URI[md5sum] = "4ed751311fe4eb437a485139fcfdf558" -SRC_URI[sha256sum] = "315f0947b3494172cb2833d7c978fc24f16f6f10dd1a5299e83b81fee7b62f27" - -SRC_URI += "file://0001-correct-path-for-CONFIGURE_FILE-in-CMakeLists.txt.patch" +SRC_URI[md5sum] = "4636d84055a434fde3a67396bf15924a" +SRC_URI[sha256sum] = "f26bbd7879ad79b45630f8efa20b1c65f0ddf81dc44f169245d512d208c71e53" S = "${WORKDIR}/poco-poco-${PV}-release"