From 4b7c115404e4e18ca796c16a64c04ba299bf5cd0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 30 Nov 2020 19:55:29 -0600 Subject: meta-openembedded: subtree update:164a6030b0..f623d8b574 Adrian Freihofer (1): paho-mqtt-c: upgrade 1.3.6 -> 1.3.7 Alexander Kamensky (2): makedumpfile: add PACKAGECONFIG options for lzo and snappy compression makedumpfile: upgrade 1.6.7 -> 1.6.8 Alexander Kanavin (4): collect: do not build with -Werror libsigrokdecode: add python 3.9 support python3-mprpc: remove the recipe gnome-calendar: update to 3.38.1, add libhandy 1.x support Anatol Belski (1): chrony: Patch CVE-2020-14367 Bartosz Golaszewski (1): libgpiod: update v1.4.4 -> v1.4.5 Beni (1): unbound: upgrade to 1.12.0 Gregory Anders (5): Add suitesparse Add python3-transitions Add python3-dill Add python3-cerberus Add python3-cvxopt Hongxu Jia (1): lvm2.inc: switch branch master to main Jasper Orschulko (1): upgrade and de-blacklist nanopb recipe Jose Quaresma (3): spirv-tools: moved into OE-core, delete from meta-oe srt: add receipe opencv: Update 4.4.0 -> 4.5.0 Kai Kang (4): xfce4-cpufreq-plugin: 1.2.1 -> 1.2.2 xfce4-weather-plugin: 0.10.1 -> 0.10.2 xfce4-mailwatch-plugin: 1.2.0 -> 1.3.0 tumbler: 0.2.9 -> 0.3.1 Khem Raj (71): nodejs: Fix arm32/thumb builds with clang nodejs: Update to 12.19.0 redis: Fix build on 32bit targets and clang gperftools: Fix build with new musl updates minifi-cpp: Fix build with riscv64/clang graphviz: Upgrade to 2.44.1 release musl-nscd: Update to latest remmina: Update to 1.4.8 mdbus2: Fix build with vala 0.50 ibus: Update to 1.5.3 plus fix for vala 0.50 networkd-dispatcher: Upgrade to 2.1 geoclue: Use git fetcher kernel-selftest: Disable vm packageconfig for riscv layer.conf: Add hardknott to LAYERSERIES_COMPAT fmt: Upgrade to 7.1.2 lksctp-tools: Update to latest master fuse3: Upgrade to 3.10.0 rdma-core: Upgrade to 31.1 opengl-es-cts: Disable LTO fluentbit: Disable LTO traceroute: Fix build with LTO cmocka: Fix buils with LTO dovecot: Disable LTO redis-plus-plus: Upgrade to 1.2.1 suitesparse: Exclude from world python3-icu: Update to 2.6 meta-python: Drop RDEPEND'ing on python3-typing python3-cvxopt: Exclude from world builds packagegroup-meta-multimedia: Add srt gedit: Inherit python3targetconfig gmime: Fix append to do_configure dconf: Add leading whitespace for append operator kexec-tools-klibc: Add leading whitespace for append operator spice: Add leading whitespace for append operator meta-oe: Add leading whitespace for append operator libgusb: Update to 0.3.5 botan: Mark incompatible with riscv32 projucer: Link with libatomic on rv32 mariadb: Fix build on 32bit arches with 64bit time_t liburing: Fix build on 32-bit arches with 64-bit time_t librtorrent: Disable instrumentation on rv32 ntopng: Link with libatomic on rv32 poco: Add riscv32 support capnproto: Fix build on 32bit arches with 64bit time_t defaults directfb: Fix build on riscv32 opensaf: Fix build on 32bit arches with 64bit time_t e.g. RISCV-32 rocksdb: Update to 6.12.7 qpdf: Link with libatomic on rv32 libkcapi: Fix build on riscv32 jack: Upgrade to 1.19.16 vlc: Fix build on riscv32 fluentbit: Link with libatomic on riscv32 openipmi: Inherit python3targetconfig libplist: Inherit python3targetconfig postgresql: Inherit python3targetconfig python-grpcio-tools: Add missing space for append python3-pykwalify: Do not unset _PYTHON_SYSCONFIGDATA_NAME thingsboard-gateway: Move under dynamic layers musl-nscd: Replace -fcommon with code patch musl-nscd: Add missing deps on flex and bison during build python3-pytest: Upgrade to 6.1.2 python3-hypothesis: Add recipe python3-sortedcontainers: Add recipe heaptrack: Fix build on musl heaptrack: Mark RISCV host incompatible packagegroup-meta-oe: Exclude heaptrack for rv32/rv64 chrony: Upgrade to 4.0 canutils,can-utils: Add cansequence to u-a as well packagegroup-meta-python: Add newly added recipes to packagegroup-meta-python3 pipewire: Link with libatomic for riscv32 python3-matplotlib: Disable LTO for clang/riscv Kory Maincent (1): libftdi: add swig-native to dependencies Leon Anavi (37): python3-luma-oled: Upgrade 3.6.0 -> 3.7.0 python3-cryptography-vectors: Upgrade 3.1.1 -> 3.2 python3-pyexpect: Upgrade 1.0.20 -> 1.0.21 python3-markdown: Upgrade 3.3.2 -> 3.3.3 python3-sh: Upgrade 1.14.0 -> 1.14.1 python3-kiwisolver: Upgrade 1.2.0 -> 1.3.0 python3-aiohttp: Upgrade 3.7.1 -> 3.7.2 python3-aiofiles: Upgrade 0.5.0 -> 0.6.0 python3-regex: Upgrade 2020.10.23 -> 2020.10.28 python3-dateparser: Upgrade 0.7.6 -> 1.0.0 python3-langtable: Upgrade 0.0.53 -> 0.0.54 python3-kiwisolver: Upgrade 1.3.0 -> 1.3.1 python3-tornado: Upgrade 6.0.4 -> 6.1 python3-ipython: Upgrade 7.18.1 -> 7.19.0 python3-cmd2: Upgrade 1.3.11 -> 1.4.0 python3-dill: Upgrade 0.3.2 -> 0.3.3 python3-colorlog: Upgrade 4.4.0 -> 4.6.2 python3-pandas: Upgrade 1.1.3 -> 1.1.4 python3-attrs: 20.2.0 -> 20.3.0 python3-gmqtt: Upgrade 0.6.7 -> 0.6.8 python3-diskcache: Upgrade 5.0.3 -> 5.1.0 python3-croniter: Upgrade 0.3.35 -> 0.3.36 python3-bitarray: Upgrade 1.6.0 -> 1.6.1 python3-certifi: Upgrade 2020.6.20 -> 2020.11.8 python3-cantools: Upgrade 35.3.0 -> 35.5.0 python3-arpeggio: Upgrade 1.9.2 -> 1.10.1 python3-toml: Upgrade 0.10.1 -> 0.10.2 python3-pyrad: Upgrade 2.3 -> 2.4 python3-bitstruct: Upgrade 8.11.0 -> 8.11.1 python3-yarl: Upgrade 1.6.2 -> 1.6.3 python3-luma-core: Upgrade 1.17.3 -> 2.0.1 python3-luma-oled: Upgrade 3.7.0 -> 3.8.1 python3-fastnumbers: Upgrade 3.0.0 -> 3.1.0 python3-ansi2html: Upgrade 1.5.2 -> 1.6.0 python3-prettytable: Upgrade 1.0.1 -> 2.0.0 python3-urllib3: Upgrade 1.25.11 -> 1.26.2 python3-transitions: Upgrade 0.8.4 -> 0.8.5 Li Zhou (1): ptpd: Solve memory leak for function NTPDCrequest Maciej Pijanowski (2): cdrkit: add native to BBCLASSEXTEND cdrkit: split into more packages Mark Jonas (5): mbedtls: Fix typo in PACKAGECONFIG python3-pyinotify: Add missing ctypes dependency libsocketcan: Add PACKAGECONFIG options libsocketcan: Update to 0.0.12 imagemagick: Add NOTICE to collected license texts Max Kellermann (1): php: remove the failing ${D}/${TMPDIR} code Mingli Yu (6): ndpi: add new recipe libmaxminddb: add new recipe ntopng: add new recipe ntop: remove the recipe packagegroup-meta-networking.bb: add ntopng related recipes traceroute: set VPATH Nick Rosbrook (3): strongswan: add some PACKAGECONFIG options for EAP strongswan: do not use deprecated stroke and starter by default strongswan: remove ldap from default PACKAGECONFIG Pierre-Jean Texier (1): inotify-tools: upgrade 3.20.2.2 -> 3.20.11.0 Randy Witt (1): numactl: Remove the recipe Ricardo Salveti (3): wireguard-module: upgrade 1.0.20200712 -> 1.0.20200908 wireguard-tools: upgrade 1.0.20200513 -> 1.0.20200827 wireguard-module: upgrade 1.0.20200908 -> 1.0.20201112 Sakib Sajal (1): libssh2: fix ptest Sinan Kaya (3): collectd: fix the test condition for dash compatibility heaptrack: add bitbake recipe cpp-netlib: add bitbake recipe Tim Orling (16): python3-atomicwrites: drop (moved to oe-core) python3-attrs: drop (moved to oe-core) python3-iniconfig: drop (moved to oe-core) python3-more-itertools: drop (moved to oe-core) python3-pathlib2: drop (moved to oe-core) python3-toml: drop (moved to oe-core) python3-py: drop (moved to oe-core) python3-setuptools-scm: drop (moved to oe-core) python3-packaging: drop (moved to oe-core) python3-wcwidth: drop (moved to oe-core) python3-zipp: drop (moved to oe-core) python3-importlib-metadata: drop (moved to oe-core) python3-pluggy: drop (moved to oe-core) python3-pytest: drop (moved to oe-core) python3-hypothesis: drop (moved to oe-core) python3-sortedcontainers: drop (moved to oe-core) Trevor Gamblin (2): python3-jinja2: Fix ptest RDEPENDS and file installation python3-markupsafe: Fix ptest RDEPENDS and installation William A. Kennington III (1): span-lite: Bump e03d116..0.8.1 Yi Zhao (5): minifi-cpp: specify GCC_AR and GCC_RANLIB quagga: unify volatiles file name minifi-cpp: depend on nettle and lz4 nss: upgrade 3.57 -> 3.59 krb5: upgrade 1.17.1 -> 1.17.2 Zang Ruochen (19): libnftnl: upgrade 1.1.7 -> 1.1.8 xfsprogs: upgrade 5.8.0 -> 5.9.0 radvd: upgrade 2.18 -> 2.19 fmt: upgrade 7.0.3 -> 7.1.0 hidapi: upgrade 0.9.0 -> 0.10.0 libkcapi: upgrade 1.2.0 -> 1.2.1 modemmanager: upgrade 1.14.2 -> 1.14.6 nvme-cli: upgrade 1.12 -> 1.13 ostree: upgrade 2020.6 -> 2020.7 poppler-data: upgrade 0.4.9 -> 0.4.10 nftables: upgrade 0.9.6 -> 0.9.7 toybox: upgrade 0.8.3 -> 0.8.4 fbgrab: upgrade 1.3.3 -> 1.4 mraa: upgrade 2.1.0 -> 2.2.0 opensaf: upgrade 5.20.05 -> 5.20.08 openvpn: upgrade 2.4.9 -> 2.5.0 poppler: upgrade 20.10.0 -> 20.11.0 tmux: upgrade 3.1b -> 3.1c xmlsec1: upgrade 1.2.30 -> 1.2.31 changqing.li@windriver.com (1): thin-provisioning-tools: switch branch from master to main hasan.men (2): thingsboard-gateway: Add recipe for v2.5.2 python3-jsonpath-rw: Add recipe for v1.4.0 richard (1): poco: Upgrade 1.9.4 -> 1.10.1 viatsk (1): tcpdump: Patch for CVE-2020-8037 zangrc (27): sshfs-fuse: upgrade 3.7.0 -> 3.7.1 can-utils: upgrade 2020.02.04 -> 2020.11.0 hwdata: upgrade 0.340 -> 0.341 libio-pty-perl: upgrade 1.14 -> 1.15 live555: upgrade 20200819 -> 20201105 zile: upgrade 2.4.14 -> 2.4.15 rdma-core: upgrade 31.1 -> 32.0 strongswan: upgrade 5.8.4 -> 5.9.1 fio: upgrade 3.22 -> 3.24 libharu: Fix the packaging bug modemmanager: upgrade 1.14.6 -> 1.14.8 openldap: upgrade 2.4.51 -> 2.4.56 protobuf: upgrade 3.13.0.1 -> 3.14.0 nghttp2: upgrade 2.41.0 -> 2.42.0 nngpp: upgrade 1.2.4 -> 1.3.0 snort: upgrade 2.9.16.1 -> 2.9.17 weechat: upgrade 2.9 -> 3.0 cjson: upgrade 1.7.13 -> 1.7.14 cloc: upgrade 1.84 -> 1.88 jpnevulator: upgrade 2.3.5 -> 2.3.6 libjcat: upgrade 0.1.3 -> 0.1.4 libsigc++-3: upgrade 3.0.3 -> 3.0.6 ocl-icd: upgrade 2.2.12 -> 2.2.13 opencl-clhpp: upgrade 2.0.11 -> 2.0.12 ostree: upgrade 2020.7 -> 2020.8 pkcs11-helper: upgrade 1.26 -> 1.27 netplan: upgrade 0.99 -> 0.100 zhengruoqin (1): dnf-plugin-tui: Update to the latest version Signed-off-by: Andrew Geissler Change-Id: I286bb6d58bf30588516b35ec06ddfd0bedee2e64 --- .../poco/0001-Add-support-of-arch-riscv32.patch | 47 ++++++++++ ...o-install-non-existing-Encodings-testsuit.patch | 31 ------- ...e-double-operations-when-using-double-flo.patch | 28 ------ .../meta-oe/recipes-support/poco/poco_1.10.1.bb | 102 ++++++++++++++++++++ .../meta-oe/recipes-support/poco/poco_1.9.4.bb | 103 --------------------- 5 files changed, 149 insertions(+), 162 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb (limited to 'meta-openembedded/meta-oe/recipes-support/poco') diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch new file mode 100644 index 000000000..e6b673b11 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch @@ -0,0 +1,47 @@ +From 98d277655e411f56fba705c0bf2efc6562c23807 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 15 Nov 2020 11:37:33 -0800 +Subject: [PATCH] Add support of arch riscv32 + +Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3138] +Signed-off-by: Khem Raj +--- + Foundation/include/Poco/Platform.h | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h +index 799db417e..b8506a248 100644 +--- a/Foundation/include/Poco/Platform.h ++++ b/Foundation/include/Poco/Platform.h +@@ -135,6 +135,7 @@ + #define POCO_ARCH_AARCH64 0x0f + #define POCO_ARCH_ARM64 0x0f // same as POCO_ARCH_AARCH64 + #define POCO_ARCH_RISCV64 0x10 ++#define POCO_ARCH_RISCV32 0x11 + + + #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) +@@ -225,12 +226,16 @@ + #elif defined(__AARCH64EB__) + #define POCO_ARCH POCO_ARCH_AARCH64 + #define POCO_ARCH_BIG_ENDIAN 1 +-#elif defined(__riscv) && (__riscv_xlen == 64) +- #define POCO_ARCH POCO_ARCH_RISCV64 +- #define POCO_ARCH_LITTLE_ENDIAN 1 ++#elif defined(__riscv) ++ #if (__riscv_xlen == 64) ++ #define POCO_ARCH POCO_ARCH_RISCV64 ++ #define POCO_ARCH_LITTLE_ENDIAN 1 ++ #elif(__riscv_xlen == 32) ++ #define POCO_ARCH POCO_ARCH_RISCV32 ++ #define POCO_ARCH_LITTLE_ENDIAN 1 ++ #endif + #endif + +- + #if defined(__clang__) + #define POCO_COMPILER_CLANG + #elif defined(_MSC_VER) +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch deleted file mode 100644 index f4a358f47..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof -Date: Wed, 22 Aug 2018 21:42:09 +0200 -Subject: [PATCH] Don't try to install non existing Encodings/testsuite/data - -Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437] ---- - Encodings/testsuite/CMakeLists.txt | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/Encodings/testsuite/CMakeLists.txt b/Encodings/testsuite/CMakeLists.txt -index 7508e5522..79495ae02 100644 ---- a/Encodings/testsuite/CMakeLists.txt -+++ b/Encodings/testsuite/CMakeLists.txt -@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE - add_executable( ${TESTUNIT} ${TEST_SRCS} ) - if(ANDROID) - add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -- COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) -+ COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) - else() - add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -- # The test is run in the build directory. So the test data is copied there too -- add_custom_command(TARGET ${TESTUNIT} POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data ) - endif() - #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) - target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit ) --- -2.18.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch deleted file mode 100644 index c0de32daf..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 589a5442a841b156a1890bc2d26e7a5103e2f672 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 1 Nov 2019 17:53:50 -0700 -Subject: [PATCH] riscv: Enable double operations when using double float abi - -Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/2825] -Signed-off-by: Khem Raj ---- - Foundation/src/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 69cea1aca..ff7a5c9ce 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,8 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || \ -- defined(nios2) || defined(__nios2) || defined(__nios2__) -+ defined(nios2) || defined(__nios2) || defined(__nios2__) || \ -+ (defined(__riscv) && defined(__riscv_float_abi_double)) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb new file mode 100644 index 000000000..48b31dd3f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb @@ -0,0 +1,102 @@ +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." +HOMEPAGE = "http://pocoproject.org/" +SECTION = "libs" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" + +# These dependencies are required by Foundation +DEPENDS = "libpcre zlib" + +SRC_URI = " \ + git://github.com/pocoproject/poco.git;branch=poco-${PV} \ + file://0001-Add-support-of-arch-riscv32.patch \ + file://run-ptest \ + " +SRCREV = "a3d827d80eb7f3329c58e73eb2906cb7ba829019" + +UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +# 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 JWT Data DataSQLite Zip Encodings Redis" + +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[JWT] = "-DENABLE_JWT=ON,-DENABLE_JWT=OFF,openssl" +PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" +PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" +PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" +PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" +PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=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 -DMYSQL_LIB:STRING=mysqlclient_r,-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" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + ${@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" + +python populate_packages_prepend () { + poco_libdir = d.expand('${libdir}') + pn = d.getVar("PN") + packages = [] + testrunners = [] + + def hook(f, pkg, file_regex, output_pattern, modulename): + packages.append(pkg) + testrunners.append(modulename) + + do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', + 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) + + d.setVar("RRECOMMENDS_%s" % pn, " ".join(packages)) + d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) +} + +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" +} + +PACKAGES_DYNAMIC = "poco-.*" + +# "poco" is a metapackage which pulls in all Poco components +ALLOW_EMPTY_${PN} = "1" + +# 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" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb deleted file mode 100644 index fcd521975..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.9.4.bb +++ /dev/null @@ -1,103 +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." -HOMEPAGE = "http://pocoproject.org/" -SECTION = "libs" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" - -# These dependencies are required by Foundation -DEPENDS = "libpcre zlib" - -SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=poco-${PV} \ - file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ - file://0001-riscv-Enable-double-operations-when-using-double-flo.patch \ - file://run-ptest \ - " -SRCREV = "b95393dcc3640807838e8323b4e600e54d2e8116" - -UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit cmake ptest - -# 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 Encodings Redis" - -PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-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 -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_NETSSL=OFF,openssl" -PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_CRYPTO=OFF,openssl" -PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" -PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" -PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" -PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" -PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=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 -DMYSQL_LIB:STRING=mysqlclient_r,-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" - -EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ - -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ - ${@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" - -python populate_packages_prepend () { - poco_libdir = d.expand('${libdir}') - pn = d.getVar("PN") - packages = [] - testrunners = [] - - def hook(f, pkg, file_regex, output_pattern, modulename): - packages.append(pkg) - testrunners.append(modulename) - - do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', - 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) - - d.setVar("RRECOMMENDS_%s" % pn, " ".join(packages)) - d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) -} - -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" -} - -PACKAGES_DYNAMIC = "poco-.*" - -# "poco" is a metapackage which pulls in all Poco components -ALLOW_EMPTY_${PN} = "1" - -# 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" - -BBCLASSEXTEND = "native" -- cgit v1.2.3