diff options
Diffstat (limited to 'meta/recipes-connectivity/socat')
-rw-r--r-- | meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch | 35 | ||||
-rw-r--r-- | meta/recipes-connectivity/socat/socat_1.7.4.4.bb (renamed from meta/recipes-connectivity/socat/socat_1.7.4.3.bb) | 6 |
2 files changed, 2 insertions, 39 deletions
diff --git a/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch b/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch deleted file mode 100644 index fbfb0816dd..0000000000 --- a/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From d67d6b4f981db9612d808bd723176a1d2996d53a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 17 Jan 2022 13:21:32 +0100 | ||
4 | Subject: [PATCH] configure.ac: check getprotobynumber_r with AC_TRY_LINK | ||
5 | |||
6 | AC_TRY_COMPILE won't error out if the function is altogether absent | ||
7 | (e.g. on linux musl C library), the test needs to link all the way. | ||
8 | |||
9 | Upstream-Status: Submitted [via email to socat@dest-unreach.org] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | configure.ac | 6 +++--- | ||
13 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index d4acc9e..973a7f2 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) | ||
20 | # getprotobynumber_r() is not standardized | ||
21 | AC_MSG_CHECKING(for getprotobynumber_r() variant) | ||
22 | AC_CACHE_VAL(sc_cv_getprotobynumber_r, | ||
23 | -[AC_TRY_COMPILE([#include <stddef.h> | ||
24 | +[AC_TRY_LINK([#include <stddef.h> | ||
25 | #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], | ||
26 | [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], | ||
27 | - [AC_TRY_COMPILE([#include <stddef.h> | ||
28 | + [AC_TRY_LINK([#include <stddef.h> | ||
29 | #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024);], | ||
30 | [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], | ||
31 | - [AC_TRY_COMPILE([#include <stddef.h> | ||
32 | + [AC_TRY_LINK([#include <stddef.h> | ||
33 | #include <netdb.h>],[getprotobynumber_r(1,NULL,NULL);], | ||
34 | [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], | ||
35 | |||
diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.3.bb b/meta/recipes-connectivity/socat/socat_1.7.4.4.bb index a4a0a8933e..5a379380d1 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.4.3.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.4.4.bb | |||
@@ -9,11 +9,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
10 | file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86" | 10 | file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86" |
11 | 11 | ||
12 | SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ | 12 | SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2" |
13 | file://0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch \ | ||
14 | " | ||
15 | 13 | ||
16 | SRC_URI[sha256sum] = "d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007" | 14 | SRC_URI[sha256sum] = "fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac" |
17 | 15 | ||
18 | inherit autotools | 16 | inherit autotools |
19 | 17 | ||