net-snmp: Fix compiler options with paths in net-snmp-config
PATCH 1/2 net-snmp: Fix compiler options with paths in net-snmp-config
options which involve paths into workspace are usually filtered out with the sed command, however currently it does half the job and the resulting config file gets partial replacements leaving the compiler options with bad syntax e.g.
-fdebug-prefix-map option is left with -fdebug-prefix-map= which is not correct syntax, the effect of this is seen in other recipes which then invoke net-snmp-config script and add the flags obtained from this script into its own configure scripts and then tries to execute tests, these tests fail because of bad compiler options e.g. keepalived where configure tests fails like
| configure: error: *** incorrect CFLAGS from net-snmp-config
this is because of wrong compiler options that it got from recipe-sysroot/usr/bin/crossscripts/net-snmp-config
This patch tries to be specific about which options should be skimmed and removes the options completely
--- meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +4 -4
@@ -118,10 +118,10 @@ do_install_append() { sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ -i ${D}${bindir}/net-snmp-create-v3-user sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ - -e "s@${STAGING_DIR_NATIVE}[=]*@@g" \ - -e "s@${STAGING_DIR_HOST}[=]*@@g" \ - -e "s@${WORKDIR}[=]*@@g" \ - -e "s@${D}@@g" \ + -e "s@\([^ ]*-fdebug-prefix-map=[^ ]*\)\1*@@g" \ + -e "s@\([^ ]*--sysroot=[^ ]*\)\1*@@g" \ + -e "s@\([^ ]*--with-libtool-sysroot=[^ ]*\)\1*@@g" \ + -e "s@\([^ ]*--with-install-prefix=[^ ]*\)\1*@@g" \ -i ${D}${bindir}/net-snmp-config if [ "${HAS_PERL}" = "1" ]; then
Signature · 1 line
2.16.1
PATCH 2/2 grpc: Update to 1.8.5
Switch to Unix Makefiles in cmake generator, it
could not be built with ninja
---
...01-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch | 0
...01-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 0
...001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 0
...01-use-the-right-protoc-executable-regardless-of-protob.patch | 0
meta-oe/recipes-devtools/grpc/{grpc_1.6.6.bb => grpc_1.8.5.bb} | 9 +++++----
5 files changed, 5 insertions(+), 4 deletions(-)
rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch (100%)
rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch (100%)
rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch (100%)
rename meta-oe/recipes-devtools/grpc/{grpc-1.6.6 => grpc}/0001-use-the-right-protoc-executable-regardless-of-protob.patch (100%)
rename meta-oe/recipes-devtools/grpc/{grpc_1.6.6.bb => grpc_1.8.5.bb} (78%)meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch renamed from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists-when-cross-compiling-the-host-grpc_cpp_pl.patch +0 -0
meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch renamed from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch +0 -0
meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch renamed from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +0 -0
meta-oe/recipes-devtools/grpc/grpc/0001-use-the-right-protoc-executable-regardless-of-protob.patch renamed from meta-oe/recipes-devtools/grpc/grpc-1.6.6/0001-use-the-right-protoc-executable-regardless-of-protob.patch +0 -0
meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb renamed from meta-oe/recipes-devtools/grpc/grpc_1.6.6.bb +5 -4
@@ -10,12 +10,11 @@ DEPENDS_append_class-target = " gtest grpc-native " LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "https://github.com/grpc/grpc/archive/v1.6.6.tar.gz" -SRC_URI[md5sum] = "a960878ad0231189d48ac8ff17eeca3c" -SRC_URI[sha256sum] = "b97eaa0c8a63b0492dc94bdad621795b4815278e841f06b0c78d6bcbd4c8bdec" +SRC_URI = "https://github.com/grpc/grpc/archive/v${PV}.tar.gz" +SRC_URI[md5sum] = "b565fa6787e42f4969395870c2ad436e" +SRC_URI[sha256sum] = "df9168da760fd2ee970c74c9d1b63377e0024be248deaa844e784d0df47599de" SRC_URI += " \ - file://0001-use-the-right-protoc-executable-regardless-of-protob.patch \ file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ "
@@ -33,6 +32,8 @@ EXTRA_OECMAKE = " \ -DBUILD_SHARED_LIBS=ON \ " +OECMAKE_GENERATOR = "Unix Makefiles" + FILES_${PN}-dev += "${libdir}/cmake" BBCLASSEXTEND = "native"
Signature · 1 line
2.16.1