diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch | 57 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb | 13 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch | 35 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb | 5 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch | 12 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.18.0.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb) | 6 |
8 files changed, 57 insertions, 75 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch deleted file mode 100644 index 4c996656c..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 329e27c8ad30e76ab50c7949cc95ba8eb0efabd2 Mon Sep 17 00:00:00 2001 -From: Anton Blanchard <anton@ozlabs.org> -Date: Tue, 17 Aug 2021 09:53:41 +1000 -Subject: [PATCH] Use GNUInstallDirs instead of hard wiring install directories - -On a multilib setup cmake files should go into lib64. - -Upstream-Status: Submitted [https://github.com/CPPAlliance/url/pull/38] ---- - CMakeLists.txt | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b53f31..ebb7346 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -109,20 +109,22 @@ else() - endif() - - if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT BOOST_URL_IN_BOOST_TREE) -+ include(GNUInstallDirs) -+ - set_target_properties(boost_url PROPERTIES EXPORT_NAME url) - install(TARGETS boost_url EXPORT boost_url_targets) - - install(EXPORT boost_url_targets - FILE boost_url-targets.cmake - NAMESPACE Boost:: -- DESTINATION lib/cmake/boost_url -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url - ) - - include(CMakePackageConfigHelpers) - - configure_package_config_file(cmake/config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config.cmake -- INSTALL_DESTINATION lib/cmake/boost_url -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url - ) - - write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/boost_url-config-version.cmake -@@ -132,10 +134,10 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT BOOST_URL_IN_BOOST - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/boost_url-config-version.cmake -- DESTINATION lib/cmake/boost_url -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/boost_url - ) - -- install(DIRECTORY include/ DESTINATION include) -+ install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - if(BOOST_URL_BUILD_TESTS) --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb index cb3664fe3..9f759100b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb @@ -4,16 +4,17 @@ SECTION = "libs" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop \ - file://0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch \ - " +SRC_URI = "git://github.com/CPPAlliance/url.git;branch=develop" -SRCREV = "2c867fbe284ae532f1329b87a86ad3f8cd382867" +SRCREV = "4f712ed69a04a344957d22efa5dc111b415b3aff" S = "${WORKDIR}/git" -inherit cmake - DEPENDS = "boost" BBCLASSEXTEND = "native nativesdk" + +do_install() { + mkdir -p ${D}/${includedir} + cp -r ${S}/include/** ${D}/${includedir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb index d4fed864d..7cd06f102 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb @@ -7,7 +7,7 @@ DESCRIPTION = "jemalloc is a general purpose malloc(3) implementation that empha fragmentation avoidance and scalable concurrency support." HOMEPAGE = "https://github.com/jemalloc/jemalloc" -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" SECTION = "libs" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb index 7dbefa115..76d1c8bf3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -24,7 +24,7 @@ PV = "1.0.1+git${SRCPV}" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig DEPENDS = "json-c" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch new file mode 100644 index 000000000..54cd096e4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch @@ -0,0 +1,35 @@ +From 436163ab845c263312cf3d4717a43727cf5f0747 Mon Sep 17 00:00:00 2001 +From: Matteo Croce <mcroce@microsoft.com> +Date: Wed, 15 Sep 2021 17:54:01 +0200 +Subject: [PATCH] Use /usr/bin/env python3 instead of just /usr/bin/python3 + +Upstream-Status: inappropriate [OE specific] + +--- + ostra/ostra-cg | 2 +- + ostra/python/ostra.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ostra/ostra-cg b/ostra/ostra-cg +index 52c902e..8142e67 100755 +--- a/ostra/ostra-cg ++++ b/ostra/ostra-cg +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # ostra-cg - generate callgraphs from encoded trace + # + # Arnaldo Carvalho de Melo <acme@redhat.com> +diff --git a/ostra/python/ostra.py b/ostra/python/ostra.py +index 86fe079..9bb5ad1 100755 +--- a/ostra/python/ostra.py ++++ b/ostra/python/ostra.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + # + # Copyright (C) 2005, 2006, 2007 Arnaldo Carvalho de Melo + # +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb index db7d88cdf..0fdde93e0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb @@ -9,11 +9,12 @@ COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux" SRCREV = "f02af2553ea58ae1186226af0d0ec835a248358f" SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git \ - file://0001-CMakeList.txt-make-python-optional.patch" + file://0001-CMakeList.txt-make-python-optional.patch \ + file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig PACKAGECONFIG[python3] = ",,python3-core,python3-core" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch index fc7286122..bd3a277a3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Makefile.am-include-descriptor.cc-when-building-libp.patch @@ -1,7 +1,8 @@ -From 321709837f412e2f590e36e3fe33571bb40036a7 Mon Sep 17 00:00:00 2001 +From 8515ceec5ba3e2fcdbc819b5bf10fe742d7c9d5d Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Thu, 27 Jun 2019 13:27:18 +0000 -Subject: [PATCH] Makefile.am: include descriptor.pb.cc when building libprotoc.so +Subject: [PATCH] Makefile.am: include descriptor.pb.cc when building + libprotoc.so * otherwise plugin.pb.o has undefined symbol scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto and build with gold fails with: @@ -10,19 +11,20 @@ Subject: [PATCH] Makefile.am: include descriptor.pb.cc when building libprotoc.s Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am -index be18ba761..57e3daec1 100644 +index d4f11ce79..96d911746 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -313,6 +313,7 @@ libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map +@@ -323,6 +323,7 @@ libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map endif libprotoc_la_SOURCES = \ + google/protobuf/descriptor.pb.cc \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ - google/protobuf/compiler/plugin.cc \ + google/protobuf/compiler/cpp/cpp_enum.cc \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.18.0.bb index 4de2c93d4..9f501124a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.18.0.bb @@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "909a0f36a10075c4b4bc70fdee2c7e32dd612a72" +SRCREV = "89b14b1d16eba4d44af43256fc45b24a6a348557" -SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ +SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=3.18.x \ file://run-ptest \ file://0001-protobuf-fix-configure-error.patch \ file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \ file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ -" + " S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig ptest |