librdkafka: Use CMAKE_INSTALL_LIBDIR
PATCH 1/17 librdkafka: Use CMAKE_INSTALL_LIBDIR
--- .../0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 +++++++++++++++++++ .../librdkafka/librdkafka_1.8.2.bb | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch
meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch new file +30 -0
@@ -0,0 +1,30 @@ +From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 19 Mar 2022 21:36:41 -0700 +Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR + +this ensures that it is portable across platforms e.g. ppc64/linux +uses lib64 not lib + +Upstream-Status: Submitted [https://github.com/edenhill/librdkafka/pull/3770] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d1129bce..774473fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in" "${GENERATED_DIR}/config.h") + + include(GNUInstallDirs) + +-set(config_install_dir "lib/cmake/${PROJECT_NAME}") ++set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + +-- +2.35.1 +
meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb +3 -1
@@ -7,7 +7,9 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=2be8675acbfdac48935e73897af5f646" -SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master" +SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \ + file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \ + " SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996" DEPENDS = "zlib openssl zstd"
Signature · 1 line
2.35.1
PATCH 2/17 lvgl: Pass libdir via LIB_INSTALL_DIR to cmake
Ensures it packages correclty on all platforms e.g. pp64
--- meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb +1 -0
@@ -16,6 +16,7 @@ REQUIRED_DISTRO_FEATURES = "wayland" inherit cmake inherit features_check +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${libdir}" S = "${WORKDIR}/${PN}-${PV}" LVGL_CONFIG_LV_MEM_CUSTOM ?= "0"
Signature · 1 line
2.35.1
PATCH 3/17 liburing: Define libdir based on environment variable
In reply to Khem Rajdefault variable is set to hardcode 'lib' which may not be right for all platforms
--- meta-oe/recipes-support/liburing/liburing_2.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/liburing/liburing_2.1.bb +2 -2
@@ -24,8 +24,8 @@ XCFLAGS:append:libc-musl = " -lucontext" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" do_configure() { - ${S}/configure --prefix=${prefix} + ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} } do_install () { - oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} + oe_runmake install DESTDIR=${D} }
Signature · 1 line
2.35.1
PATCH 4/17 http-parser: Define LIBDIR
In reply to Khem RajLIBDIR is otherwise hardcoded to PREFIX/lib which is not correct for all platforms. define PLATFORM explicitly, otherwise it pokes at build system for it
--- .../recipes-support/http-parser/http-parser_2.9.4.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb +3 -1
@@ -17,6 +17,8 @@ SRCREV = "2343fd6b5214b2ded2cdcf76de2bf60903bb90cd" S = "${WORKDIR}/git" +EXTRA_OEMAKE = "PLATFORM=linux" + do_configure[noexec] = "1" do_compile() {
@@ -24,7 +26,7 @@ do_compile() { } do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} + oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} } BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.35.1
PATCH 5/17 msgpack-cpp: Upgrade to 4.1.1 release
In reply to Khem RajUse tarball from release artifacts
---
.../{msgpack-cpp_4.0.2.bb => msgpack-cpp_4.1.1.bb} | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
rename meta-oe/recipes-devtools/msgpack/{msgpack-cpp_4.0.2.bb => msgpack-cpp_4.1.1.bb} (72%)meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.1.1.bb renamed from meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb +3 -6
@@ -7,16 +7,13 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ " -PV .= "+git${SRCPV}" +SRC_URI = "https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/msgpack-cxx-${PV}.tar.gz" +SRC_URI[sha256sum] = "8115c5edcf20bc1408c798a6bdaec16c1e52b1c34859d4982a0fb03300438f0b" -SRC_URI = "git://github.com/msgpack/msgpack-c;branch=cpp_master;protocol=https \ - " -SRCREV = "3bdbf0d2ee75d46d71afa691a594777d89a22cf7" +S = "${WORKDIR}/msgpack-cxx-${PV}" DEPENDS += "boost" -S = "${WORKDIR}/git" - inherit cmake pkgconfig RDEPENDS:${PN}-dev = ""
Signature · 1 line
2.35.1
PATCH 6/17 weechat: Define LIBDIR
In reply to Khem Raj--- meta-networking/recipes-irc/weechat/weechat_3.4.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-irc/weechat/weechat_3.4.1.bb +4 -1
@@ -18,7 +18,10 @@ PACKAGECONFIG ??= " ncurses python" PACKAGECONFIG[ncurses] = "-DENABLE_NCURSES=ON,-DENABLE_NCURSES=OFF,ncurses" PACKAGECONFIG[python] = "-DENABLE_PYTHON=ON,-DENABLE_PYTHON=OFF,python3,python3" -EXTRA_OECMAKE:append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON" +EXTRA_OECMAKE:append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF \ + -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF \ + -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON \ + -DLIBDIR=${libdir}" do_configure:prepend(){ # Make sure we get dependencies from recipe-sysroot
Signature · 1 line
2.35.1
PATCH 7/17 json-schema-validator: Use GNUInstallDirs in cmake
In reply to Khem Raj--- .../0001-cmake-Use-GNUInstallDirs.patch | 46 +++++++++++++++++++ .../json-schema-validator_2.1.0.bb | 4 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch
meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch new file +46 -0
@@ -0,0 +1,46 @@ +From e0b1ad02c678513412aba95a1b2fb4005c3c0452 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 19 Mar 2022 22:40:49 -0700 +Subject: [PATCH] cmake: Use GNUInstallDirs + +This helps it make it platform independent, some platforms e.g. +ppc64/linux use /usr/lib64 for system libraries + +Upstream-Status: Submitted [https://github.com/pboettch/json-schema-validator/pull/197] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4cc218..594dc5f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,11 +122,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + endif() + endif() + ++include(GNUInstallDirs) ++ + if(JSON_VALIDATOR_INSTALL) + install(TARGETS nlohmann_json_schema_validator + EXPORT ${PROJECT_NAME}Targets +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION ${LIBDIR} ++ ARCHIVE DESTINATION ${LIBDIR} + RUNTIME DESTINATION bin) + + install(FILES src/nlohmann/json-schema.hpp +@@ -155,7 +157,7 @@ if(JSON_VALIDATOR_INSTALL) + # Set Up the Project Targets and Config Files for CMake + + # Set the install path to the cmake config files +- set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake/${PROJECT_NAME}) ++ set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + + # Create the ConfigVersion file + include(CMakePackageConfigHelpers) # write_basic_package_version_file +-- +2.35.1 +
meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb +3 -1
@@ -2,7 +2,9 @@ SUMMARY = "JSON schema validator for JSON for Modern C++" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" -SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https" +SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https \ + file://0001-cmake-Use-GNUInstallDirs.patch \ + " SRCREV = "27fc1d094503623dfe39365ba82581507524545c" S = "${WORKDIR}/git"
Signature · 1 line
2.35.1
PATCH 8/17 redis-plus-plus: Use GNUInstallDirs in cmake
In reply to Khem Raj--- ...E_INSTALL_LIBDIR-from-GNUInstallDirs.patch | 45 +++++++++++++++++++ .../redis-plus-plus/redis-plus-plus_1.3.3.bb | 4 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch
meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch new file +45 -0
@@ -0,0 +1,45 @@ +From fbb13cdb0b3591616c3f77b6bc76e75af8906cda Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 19 Mar 2022 22:59:58 -0700 +Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs + +makes it portable across platforms e.g. ppc64/linux uses usr/lib64 for +system libs + +Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/344] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f28ee4..8150f5c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -239,10 +239,12 @@ if(REDIS_PLUS_PLUS_BUILD_TEST) + add_subdirectory(test) + endif() + ++include(GNUInstallDirs) ++ + install(TARGETS ${REDIS_PLUS_PLUS_TARGETS} + EXPORT redis++-targets +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION bin + INCLUDES DESTINATION include) + +@@ -284,7 +286,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/redis++.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" @ONLY) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/redis++.pc" +- DESTINATION "lib/pkgconfig") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + # All the Debian-specific cpack defines. + if(${CMAKE_VERSION} VERSION_GREATER 3.6) +-- +2.35.1 +
meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.3.bb +3 -1
@@ -4,7 +4,9 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ + file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch \ + " SRCREV = "389ffdf9e72035ea2096b03cda7f4a6809ae6363" S = "${WORKDIR}/git"
Signature · 1 line
2.35.1
PATCH 9/17 libiec61850: Use GNUInstallDirs in cmake
In reply to Khem Raj--- ...MAKE_INSTALL_LIBDIR-from-GNUInstallD.patch | 29 +++++++++++++++++++ .../libiec61850/libiec61850_1.5.1.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch
meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 16d07a82242c3263ec0038c9b4c97355795d2dd9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 19 Mar 2022 23:16:51 -0700 +Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in + cmake + +This ensures that it gets installed in platform specified system libdir +all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 + +Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] +Signed-off-by: Khem Raj <[email protected]> +--- + pyiec61850/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/pyiec61850/CMakeLists.txt ++++ b/pyiec61850/CMakeLists.txt +@@ -31,7 +31,9 @@ endif() + + swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) +-install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++include(GNUInstallDirs) ++ ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) + + add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py)
meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb +1 -0
@@ -17,6 +17,7 @@ SRCREV = "210cf30897631fe2006ac50483caf8fd616622a2" SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ + file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.35.1
PATCH 10/17 paho-mqtt-cpp: Use CMAKE_INSTALL_LIBDIR in cmake
In reply to Khem Raj--- ...INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch | 49 +++++++++++++++++++ .../paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb | 5 +- 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch
meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch new file +49 -0
@@ -0,0 +1,49 @@ +From 2a0dd2b300242230faa92cf8e26ccd70231bc9ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 19 Mar 2022 23:37:58 -0700 +Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_BINDIR + +This ensures the install paths are not hardcoded. + +Signed-off-by: Khem Raj <[email protected]> +--- + cmake/CMakeLists.txt | 4 ++-- + src/samples/CMakeLists.txt | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index a9f8908..7eadc60 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -11,7 +11,7 @@ export(EXPORT ${package_name} + FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake" + NAMESPACE ${package_name}::) + +-install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} ++install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} + FILE ${package_name}Targets.cmake + NAMESPACE ${package_name}::) + +@@ -19,4 +19,4 @@ install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" + FindPahoMqttC.cmake + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" +- DESTINATION lib/cmake/${package_name}) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}) +diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt +index 953f5dc..d26729a 100644 +--- a/src/samples/CMakeLists.txt ++++ b/src/samples/CMakeLists.txt +@@ -103,7 +103,7 @@ endif() + + ## install binaries + install(TARGETS ${INSTALL_TARGETS} EXPORT PahoMqttCppSamples +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + +-- +2.35.1 +
meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb +3 -2
@@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = " \ file://about.html;md5=dcde438d73cf42393da9d40fabc0c9bc \ " -SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=http;branch=master;protocol=https" - +SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=http;branch=master;protocol=https \ + file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ +" SRCREV = "33921c8b68b351828650c36816e7ecf936764379" DEPENDS = "openssl paho-mqtt-c"
Signature · 1 line
2.35.1
PATCH 11/17 sqlite-orm: Define cmake variable defaults
In reply to Khem Rajensure cmake files are installed in right syslib dir
--- meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb +4 -2
@@ -11,7 +11,9 @@ SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b" SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https;branch=master" S = "${WORKDIR}/git" -EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF" +EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF -DLIB_INSTALL_DIR=${libdir} \ + -DCMAKE_INSTALL_DIR=${libdir}/cmake \ + -DPKGCONFIG_INSTALL_DIR=${libdir}/pkgconfig" BBCLASSEXTEND = "native nativesdk"
@@ -19,4 +21,4 @@ FILES:${PN}-dev += "${libdir}/cmake/${BPN}" # Header-only library RDEPENDS:${PN}-dev = "" -RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
Signature · 1 line
2.35.1
PATCH 12/17 duktape: Upgrade to 2.7.0
In reply to Khem RajLicense-Update: Update copyright years [1]
Drop upstreamed patch
Define LIBDIR so it can compile on all platforms
[1] https://github.com/svaarala/duktape/commit/d51a1ffae6b99b798db9ad1512f845d31ff63813
---
.../{duktape_2.6.0.bb => duktape_2.7.0.bb} | 11 +-
.../0001-Support-makefile-variables.patch | 297 ------------------
2 files changed, 5 insertions(+), 303 deletions(-)
rename meta-oe/recipes-extended/duktape/{duktape_2.6.0.bb => duktape_2.7.0.bb} (62%)
delete mode 100644 meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patchmeta-oe/recipes-extended/duktape/duktape_2.7.0.bb renamed from meta-oe/recipes-extended/duktape/duktape_2.6.0.bb +5 -6
@@ -2,13 +2,12 @@ SUMMARY = "Duktape embeddable Javascript engine" DESCRIPTION = "Duktape is an embeddable Javascript engine, with a focus on portability and compact footprint." HOMEPAGE = "https://duktape.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c83446610de1f63c7ca60cfcc82dec9d" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b7825df97b52f926fc71300f7880408" -SRC_URI = "https://duktape.org/duktape-${PV}.tar.xz \ - file://0001-Support-makefile-variables.patch \ -" -SRC_URI[md5sum] = "01ee8ecf3dd5c6504543c8679661bb20" -SRC_URI[sha256sum] = "96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7" +SRC_URI = "https://duktape.org/duktape-${PV}.tar.xz" +SRC_URI[sha256sum] = "90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890" + +EXTRA_OEMAKE = "INSTALL_PREFIX='${prefix}' DESTDIR='${D}' LIBDIR=${base_libdir}" do_compile () { oe_runmake -f Makefile.sharedlibrary INSTALL_PREFIX="${prefix}" DESTDIR="${D}"
meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patch deleted +0 -297
297 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 13/17 cockpit: Package missing nonarch_libdir
In reply to Khem Raj--- meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb +2 -0
@@ -166,6 +166,8 @@ FILES:${PN} += " \ ${datadir}/cockpit \ ${datadir}/metainfo/cockpit.appdata.xml \ ${datadir}/pixmaps/cockpit.png \ + ${nonarch_libdir}/tmpfiles.d \ + ${nonarch_libdir}/firewalld \ " RDEPENDS:${PN} += "${PN}-bridge"
Signature · 1 line
2.35.1
PATCH 14/17 unattended-upgrades: Package nonarch_libdir for systemd files
In reply to Khem Raj--- .../unattended-upgrades/unattended-upgrades_2.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb +1 -1
@@ -28,4 +28,4 @@ do_install:append () { rm -r ${D}/usr/usr } -FILES:${PN} = "${bindir} ${exec_prefix}/etc ${libdir} ${datadir}" +FILES:${PN} = "${bindir} ${exec_prefix}/etc ${libdir} ${datadir} ${nonarch_libdir}"
Signature · 1 line
2.35.1
PATCH 15/17 fsverity-utils: Define LIBDIR
In reply to Khem RajThis helps make it platform independent since some platforms e.g. ppc64 uses lib64 for system libpaths
--- meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb +1 -1
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git" DEPENDS = "openssl" -EXTRA_OEMAKE:append = "PREFIX=${prefix} USE_SHARED_LIB=1" +EXTRA_OEMAKE:append = "PREFIX=${prefix} LIBDIR=${libdir} USE_SHARED_LIB=1" # We want to statically link the binary to libfsverity on native Windows EXTRA_OEMAKE:remove:mingw32:class-nativesdk = "USE_SHARED_LIB=1" EXTRA_OEMAKE:remove:mingw32:class-native = "USE_SHARED_LIB=1"
Signature · 1 line
2.35.1
PATCH 16/17 luaposix: Fix INST_LIBDIR to honor libdir var
In reply to Khem Raj--- meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb +1 -1
@@ -20,7 +20,7 @@ do_compile() { } do_install() { - ${S}/build-aux/luke PREFIX=${D}${prefix} install + ${S}/build-aux/luke PREFIX=${D}${prefix} INST_LIBDIR=${D}${libdir}/lua/${LUA_VERSION} install } FILES:${PN} = "${datadir}/lua/${LUA_VERSION} \
Signature · 1 line
2.35.1
PATCH 17/17 uml-utilities: Define LIB_DIR to be libdir relative
In reply to Khem Rajhelps make it platform independent
--- .../recipes-extended/uml-utilities/uml-utilities_20040406.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +1 -1
@@ -22,7 +22,7 @@ do_compile() { } do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} LIB_DIR=${libdir}/uml } FILES:${PN} += "${libdir}/uml"
Signature · 1 line
2.35.1