diff options
-rw-r--r-- | meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Replace-use-of-AC_EGREP_CPP.patch | 39 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/libdnet/libdnet/0001-configure-Use-pkg-config-variable-to-find-check-incl.patch | 27 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/libdnet/libdnet_1.17.0.bb (renamed from meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb) | 7 |
3 files changed, 3 insertions, 70 deletions
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 @@ | |||
1 | From b0c98f93a7f427d18206c79bf2a0350dc81172f6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 6 Apr 2023 10:44:08 -0700 | ||
4 | Subject: [PATCH] configure: Replace use of AC_EGREP_CPP | ||
5 | |||
6 | Use AC_COMPILE_IFELSE instead to compute platform support for arp ioctls | ||
7 | AC_EGREP_CPP does not work as used with upcoming autoconf 2.72 | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/ofalk/libdnet/pull/85] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | m4/acinclude.m4 | 11 +++++------ | ||
13 | 1 file changed, 5 insertions(+), 6 deletions(-) | ||
14 | |||
15 | diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 | ||
16 | index d6350a2..3699bf1 100644 | ||
17 | --- a/m4/acinclude.m4 | ||
18 | +++ b/m4/acinclude.m4 | ||
19 | @@ -196,12 +196,11 @@ dnl | ||
20 | AC_DEFUN([AC_DNET_IOCTL_ARP], | ||
21 | [AC_MSG_CHECKING(for arp(7) ioctls) | ||
22 | AC_CACHE_VAL(ac_cv_dnet_ioctl_arp, | ||
23 | - AC_EGREP_CPP(werd,[#include <sys/types.h> | ||
24 | - #define BSD_COMP | ||
25 | - #include <sys/ioctl.h> | ||
26 | - #ifdef SIOCGARP | ||
27 | - werd | ||
28 | - #endif], | ||
29 | + AC_COMPILE_IFELSE( | ||
30 | + [AC_LANG_PROGRAM([[#include <sys/types.h> | ||
31 | + #define BSD_COMP | ||
32 | + #include <sys/ioctl.h>]], | ||
33 | + [[int foo = SIOCGARP;]])], | ||
34 | ac_cv_dnet_ioctl_arp=yes, | ||
35 | ac_cv_dnet_ioctl_arp=no)) | ||
36 | case "$host_os" in | ||
37 | -- | ||
38 | 2.40.0 | ||
39 | |||
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 @@ | |||
1 | From 85d8338a3ebc01a3ea7600aa602139c4eac3be07 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 6 Apr 2023 12:13:09 -0700 | ||
4 | Subject: [PATCH] configure: Use pkg-config variable to find check include paths | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/ofalk/libdnet/pull/85] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | configure.ac | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 3f0c404..553b487 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -153,7 +153,7 @@ AC_ARG_WITH(check, | ||
17 | esac ], | ||
18 | [ PKG_CHECK_MODULES([CHECK], [check]) | ||
19 | if test -n "${CHECK_LIBS}"; then | ||
20 | - CHECKINC="-I${prefix}/include" | ||
21 | + CHECKINC="${CHECK_CFLAGS}" | ||
22 | CHECKLIB="${CHECK_LIBS}" | ||
23 | AC_MSG_RESULT(yes) | ||
24 | else | ||
25 | -- | ||
26 | 2.40.0 | ||
27 | |||
diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.16.3.bb b/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" | |||
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/ofalk/libdnet.git;nobranch=1;protocol=https \ | 7 | SRC_URI = "git://github.com/ofalk/libdnet.git;nobranch=1;protocol=https" |
8 | file://0001-configure-Replace-use-of-AC_EGREP_CPP.patch \ | 8 | |
9 | file://0001-configure-Use-pkg-config-variable-to-find-check-incl.patch" | 9 | SRCREV = "912f7848bfff4ebc6d610f802a3144f84880cbe4" |
10 | SRCREV = "a03043bec8e66b240a45555e37147b22db182c21" | ||
11 | 10 | ||
12 | UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)" |
13 | 12 | ||