From a093574dc1c177a536892afec59add04d4befaa3 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Fri, 14 Apr 2017 05:55:33 +0200 Subject: [PATCH] poco: drop recipe (resolves #377) The poco recipe is in meta-oe now for quite some time and is actively updated and maintained there. Also, meta-ros with its recent changes, especially the changes due to recipe-specific sysroots, is unlikely to build with older versions of meta-oe. Hence, this commit drops the poco recipe in meta-ros for good. Signed-off-by: Lukas Bulwahn --- README.md | 4 -- recipes-support/poco/poco/run-ptest | 9 --- recipes-support/poco/poco_1.7.4.bb | 105 ---------------------------- 3 files changed, 118 deletions(-) delete mode 100644 recipes-support/poco/poco/run-ptest delete mode 100644 recipes-support/poco/poco_1.7.4.bb diff --git a/README.md b/README.md index 887b064..78e439f 100644 --- a/README.md +++ b/README.md @@ -259,10 +259,6 @@ resolved in the past. (cf. https://github.com/kartikmohta/meta-km/blob/master/recipes-devtools/yaml-cpp/yaml-cpp_0.3.0.bb) licensed with the MIT License. - The poco recipe is a copy of the poco recipe in the meta-oe layer licensed with the MIT License - (cf. http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/poco). - The recipe is included in the meta-ros layer to support the use of older versions of the meta-oe layer. - The core-image-ros-* recipes originated from the core-image-minimal recipe in OpenEmbedded Core (cf. http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/images/core-image-minimal.bb) licensed with the MIT License. diff --git a/recipes-support/poco/poco/run-ptest b/recipes-support/poco/poco/run-ptest deleted file mode 100644 index c479f7a..0000000 --- a/recipes-support/poco/poco/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/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/recipes-support/poco/poco_1.7.4.bb b/recipes-support/poco/poco_1.7.4.bb deleted file mode 100644 index e7a279f..0000000 --- a/recipes-support/poco/poco_1.7.4.bb +++ /dev/null @@ -1,105 +0,0 @@ -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" - -SRCREV = "da66f2863aa02c11967862f2d9f0251574a5e9c2" -SRC_URI = " \ - git://github.com/pocoproject/poco.git \ - file://run-ptest \ - " - -S = "${WORKDIR}/git" - -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] = "-DENABLE_NETSSL=ON,-DENABLE_NETSSL=OFF,openssl" -PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON,-DENABLE_CRYPTO=OFF,openssl" -PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" -PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON,-DENABLE_DATA_SQLITE=OFF,sqlite3" -PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" - -# Additional components not build by default, -# they might have dependencies not included in oe-core -# or they don't work on all architectures -PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR=OFF,apr apache2" -PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" -PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON,-DENABLE_DATA_MYSQL=OFF,mariadb" -PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" -PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" -PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" -PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" - -# Make a package for each library -PACKAGES = "${PN}-dbg ${POCO_PACKAGES}" -python __anonymous () { - packages = [] - testrunners = [] - components = d.getVar("PACKAGECONFIG", True).split() - components.append("Foundation") - for lib in components: - pkg = ("poco-%s" % lib.lower()).replace("_","") - packages.append(pkg) - if not d.getVar("FILES_%s" % pkg, True): - d.setVar("FILES_%s" % pkg, "${libdir}/libPoco%s.so.*" % lib) - testrunners.append("%s" % lib) - - d.setVar("POCO_PACKAGES", " ".join(packages)) - d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) -} - -# "poco" is a metapackage which pulls in all Poco components -PACKAGES += "${PN}" -RRECOMMENDS_${PN} += "${POCO_PACKAGES}" -RRECOMMENDS_${PN}_class-native = "" -ALLOW_EMPTY_${PN} = "1" - -# -dev last to pick up the remaining stuff -PACKAGES += "${PN}-dev ${PN}-staticdev" -FILES_${PN}-dev = "${includedir} ${libdir}/libPoco*.so ${libdir}/cmake" -FILES_${PN}-staticdev = "${libdir}/libPoco*.a" - -# ptest support -FILES_${PN}-dbg += "${PTEST_PATH}/bin/.debug" - -# cppunit is only built if tests are enabled -PACKAGES += "${PN}-cppunit" -FILES_${PN}-cppunit += "${libdir}/libCppUnit.so*" -ALLOW_EMPTY_${PN}-cppunit = "1" - -RDEPENDS_${PN}-ptest += "${PN}-cppunit" - -do_install_ptest () { - cp -rf ${B}/bin/ ${D}${PTEST_PATH} - cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} - cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ - find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; - echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" -}