From 7d65ad61e06e76c3f49b7f44644360cf50f43f43 Mon Sep 17 00:00:00 2001 From: alperak Date: Sun, 12 Nov 2023 23:25:25 +0300 Subject: [PATCH] libdnet: upgrade 1.16.3 -> 1.17.0 Patches removed because fixed in the new version. Changelog: - Various fixes around the build process (esp. cmake support + string.h include fixes) - Stronger cmake support, updated autotools and a few smaller fixes. Signed-off-by: alperak Signed-off-by: Khem Raj --- ...onfigure-Replace-use-of-AC_EGREP_CPP.patch | 39 ------------------- ...g-config-variable-to-find-check-incl.patch | 27 ------------- .../{libdnet_1.16.3.bb => libdnet_1.17.0.bb} | 7 ++-- 3 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch delete mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch rename meta-networking/recipes-connectivity/libdnet/{libdnet_1.16.3.bb => libdnet_1.17.0.bb} (71%) diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch b/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch deleted file mode 100644 index 133ccc46b2..0000000000 --- a/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b0c98f93a7f427d18206c79bf2a0350dc81172f6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 6 Apr 2023 10:44:08 -0700 -Subject: [PATCH] configure: Replace use of AC_EGREP_CPP - -Use AC_COMPILE_IFELSE instead to compute platform support for arp ioctls -AC_EGREP_CPP does not work as used with upcoming autoconf 2.72 - -Upstream-Status: Submitted [https://github.com/ofalk/libdnet/pull/85] -Signed-off-by: Khem Raj ---- - m4/acinclude.m4 | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 -index d6350a2..3699bf1 100644 ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -196,12 +196,11 @@ dnl - AC_DEFUN([AC_DNET_IOCTL_ARP], - [AC_MSG_CHECKING(for arp(7) ioctls) - AC_CACHE_VAL(ac_cv_dnet_ioctl_arp, -- AC_EGREP_CPP(werd,[#include -- #define BSD_COMP -- #include -- #ifdef SIOCGARP -- werd -- #endif], -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[#include -+ #define BSD_COMP -+ #include ]], -+ [[int foo = SIOCGARP;]])], - ac_cv_dnet_ioctl_arp=yes, - ac_cv_dnet_ioctl_arp=no)) - case "$host_os" in --- -2.40.0 - diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch b/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch deleted file mode 100644 index 8a78e7ac28..0000000000 --- a/meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 85d8338a3ebc01a3ea7600aa602139c4eac3be07 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 6 Apr 2023 12:13:09 -0700 -Subject: [PATCH] configure: Use pkg-config variable to find check include paths - -Upstream-Status: Submitted [https://github.com/ofalk/libdnet/pull/85] -Signed-off-by: Khem Raj ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3f0c404..553b487 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -153,7 +153,7 @@ AC_ARG_WITH(check, - esac ], - [ PKG_CHECK_MODULES([CHECK], [check]) - if test -n "${CHECK_LIBS}"; then -- CHECKINC="-I${prefix}/include" -+ CHECKINC="${CHECK_CFLAGS}" - CHECKLIB="${CHECK_LIBS}" - AC_MSG_RESULT(yes) - else --- -2.40.0 - diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.17.0.bb similarity index 71% rename from meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb rename to meta-networking/recipes-connectivity/libdnet/libdnet_1.17.0.bb index 05c8fb309f..a42d014f6c 100644 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.17.0.bb @@ -4,10 +4,9 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" -SRC_URI = "git://github.com/ofalk/libdnet.git;nobranch=1;protocol=https \ - file://0001-configure-Replace-use-of-AC_EGREP_CPP.patch \ - file://0001-configure-Use-pkg-config-variable-to-find-check-incl.patch" -SRCREV = "a03043bec8e66b240a45555e37147b22db182c21" +SRC_URI = "git://github.com/ofalk/libdnet.git;nobranch=1;protocol=https" + +SRCREV = "912f7848bfff4ebc6d610f802a3144f84880cbe4" UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P\d+(\.\d+)+)"