libdnet: Upgrade to 1.16.3
PATCH 1/1 libdnet: Upgrade to 1.16.3
Fix build with upcoming autoconf 1.16.3
Signed-off-by Khem Raj <[email protected]>
--- ...onfigure-Replace-use-of-AC_EGREP_CPP.patch | 39 +++++++++++++++++++ ...g-config-variable-to-find-check-incl.patch | 27 +++++++++++++ .../libdnet/libdnet_1.14.bb | 20 ---------- .../libdnet/libdnet_1.16.3.bb | 23 +++++++++++ 4 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch create mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch delete mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb create mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb
meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch new file +39 -0
@@ -0,0 +1,39 @@ +From b0c98f93a7f427d18206c79bf2a0350dc81172f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +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 <[email protected]> +--- + 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 <sys/types.h> +- #define BSD_COMP +- #include <sys/ioctl.h> +- #ifdef SIOCGARP +- werd +- #endif], ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[#include <sys/types.h> ++ #define BSD_COMP ++ #include <sys/ioctl.h>]], ++ [[int foo = SIOCGARP;]])], + ac_cv_dnet_ioctl_arp=yes, + ac_cv_dnet_ioctl_arp=no)) + case "$host_os" in +-- +2.40.0 +
meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 85d8338a3ebc01a3ea7600aa602139c4eac3be07 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +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 <[email protected]> +--- + 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 +
meta-networking/recipes-connectivity/libdnet/libdnet_1.14.bb deleted +0 -20
@@ -1,20 +0,0 @@ -SUMMARY = "dumb networking library" -HOMEPAGE = "http://code.google.com/p/libdnet/" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" - -SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1;protocol=https" -SRCREV = "3e782472d2a58d5e1b94d04eda4a364c2d257600" - -UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit autotools multilib_script - -acpaths = "-I ./config/" - -BBCLASSEXTEND = "native" - -MULTILIB_SCRIPTS = "${PN}:${bindir}/dnet-config"
meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb new file +23 -0
@@ -0,0 +1,23 @@ +SUMMARY = "dumb networking library" +HOMEPAGE = "https://github.com/ofalk/libdnet" +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" + +UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit autotools multilib_script pkgconfig + +DEPENDS += "libcheck" + +EXTRA_AUTORECONF += "-I ./config" +BBCLASSEXTEND = "native" + +MULTILIB_SCRIPTS = "${PN}:${bindir}/dnet-config"
Signature · 1 line
2.40.0