Skip to contentSkip to conversation

net-snmp: apply patch for cross-compilation

PATCH In review Rafaël Carré 2 participants 5 messages Dec 1, 2015 – Dec 18, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net-snmp: apply patch for cross-compilation

7fb5479 added the patch but did not apply it

---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 1 +
 1 file changed, 1 insertion(+)
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +1 -0
index b32d842..d6c7bbb 100644
@@ -20,6 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \
         file://run-ptest \
         file://dont-return-incompletely-parsed-varbinds.patch \
         file://0001-config_os_headers-Error-Fix.patch \
+        file://0002-config_os_headers-Error-Fix.patch \
         file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \
 "
 SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee"
Signature · 1 line
2.5.0
#1 lore raw
Quoted 2 lines · Rafaël Carré
         file://0001-config_os_headers-Error-Fix.patch \

+ file://0002-config_os_headers-Error-Fix.patch \

these two names look pretty similar. Can you check if these both patches are needed

#2 lore raw
Quoted 6 lines · Khem Raj
Quoted 2 lines · Rafaël Carré
         file://0001-config_os_headers-Error-Fix.patch \

+ file://0002-config_os_headers-Error-Fix.patch \

these two names look pretty similar. Can you check if these both patches are needed

Why yes they're both needed, both make configure look at host header path.

#3 lore raw
Quoted 9 lines · Rafaël Carré
Quoted 6 lines · Khem Raj
Quoted 2 lines · Rafaël Carré
         file://0001-config_os_headers-Error-Fix.patch \

+ file://0002-config_os_headers-Error-Fix.patch \

these two names look pretty similar. Can you check if these both patches are needed

Why yes they're both needed, both make configure look at host header path.

OK then either squash them into one or use some differentiating patch names.

Quoted 5 lines

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#4 lore raw

PATCH 1/1 net-snmp: apply patch for cross-compilation

7fb5479 added the patch but did not apply it
Rename patch to explicit it differentiate it from other patches

---
 .../net-snmp/0001-config_os_libs2-Error-Fix.patch  | 31 ++++++++++++++++++++++
 .../0002-config_os_headers-Error-Fix.patch         | 31 ----------------------
 .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb   |  1 +
 3 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch
 delete mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch
meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch new file +31 -0
new file mode 100644
index 0000000..5866a95
@@ -0,0 +1,31 @@
+From e24fcd140f3f6dd18fd836b197c6d4bb773e50e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <[email protected]>
+Date: Wed, 4 Nov 2015 16:49:30 +0100
+Subject: [PATCH] config_os_libs2: Error Fix
+
+ERROR: This autoconf log indicates errors, it looked at host include
+and/or library paths while determining system capabilities.
+---
+ configure.d/config_os_libs2 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
+index 47491e2..e3647f9 100644
+--- a/configure.d/config_os_libs2
++++ b/configure.d/config_os_libs2
+@@ -226,10 +226,10 @@ if test "x$with_nl" != "xno"; then
+     case $target_os in
+     linux*) # Check for libnl (linux)
+         netsnmp_save_CPPFLAGS="$CPPFLAGS"
+-        CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS"
++        CPPFLAGS="$CPPFLAGS"
+         NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
+             [AC_CHECK_HEADERS(netlink/netlink.h)
+-            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"],
++            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES"],
+             [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS])
+         if test "x$ac_cv_header_netlink_netlink_h" != xyes; then
+             NETSNMP_SEARCH_LIBS(nl_connect, nl, [
+-- 
+2.5.0
+
meta-networking/recipes-protocols/net-snmp/net-snmp/0002-config_os_headers-Error-Fix.patch deleted +0 -31
deleted file mode 100644
index a90ce1f..0000000
@@ -1,31 +0,0 @@
-From e24fcd140f3f6dd18fd836b197c6d4bb773e50e7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <[email protected]>
-Date: Wed, 4 Nov 2015 16:49:30 +0100
-Subject: [PATCH] config_os_headers: Error Fix
-
-ERROR: This autoconf log indicates errors, it looked at host include
-and/or library paths while determining system capabilities.
----
- configure.d/config_os_libs2 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
-index 47491e2..e3647f9 100644
---- a/configure.d/config_os_libs2
-+++ b/configure.d/config_os_libs2
-@@ -226,10 +226,10 @@ if test "x$with_nl" != "xno"; then
-     case $target_os in
-     linux*) # Check for libnl (linux)
-         netsnmp_save_CPPFLAGS="$CPPFLAGS"
--        CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS"
-+        CPPFLAGS="$CPPFLAGS"
-         NETSNMP_SEARCH_LIBS(nl_connect, nl-3,
-             [AC_CHECK_HEADERS(netlink/netlink.h)
--            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"],
-+            EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES"],
-             [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS])
-         if test "x$ac_cv_header_netlink_netlink_h" != xyes; then
-             NETSNMP_SEARCH_LIBS(nl_connect, nl, [
--- 
-2.5.0
-
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +1 -0
index b32d842..62186d4 100644
@@ -20,6 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \
         file://run-ptest \
         file://dont-return-incompletely-parsed-varbinds.patch \
         file://0001-config_os_headers-Error-Fix.patch \
+        file://0001-config_os_libs2-Error-Fix.patch \
         file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \
 "
 SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee"
Signature · 1 line
2.5.0