diff options
author | Hongxu Jia <hongxu.jia@eng.windriver.com> | 2023-12-06 00:48:35 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-08 16:58:33 +0000 |
commit | 5b153cc1155ccc2626ca39c4d5b1f79814749222 (patch) | |
tree | 38b71a0f97b3ca1e2d4f8fa6a1bfcd3f5ed82120 /meta/recipes-connectivity | |
parent | 36b66553a734221d436ab0d08d9fae77324a8212 (diff) | |
download | poky-5b153cc1155ccc2626ca39c4d5b1f79814749222.tar.gz |
socat: 1.7.4.4 -> 1.8.0.0
1. No chagne on license [1], original md5 is not right because
beginline=241 does not match
2. Fix two compile and one install failures
[1] https://repo.or.cz/socat.git/blobdiff/c9ff62744f4140418f4edce7e395d1a30e9161b1..2da070164d454971d5c970b5278e645051f0d0f7:/README
(From OE-Core rev: a8cb052a78d0422acb52c402a3836f4ee174ee66)
Signed-off-by: Hongxu Jia <hongxu.jia@eng.windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch | 62 | ||||
-rw-r--r-- | meta/recipes-connectivity/socat/socat_1.8.0.0.bb (renamed from meta/recipes-connectivity/socat/socat_1.7.4.4.bb) | 8 |
2 files changed, 67 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch b/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch new file mode 100644 index 0000000000..9051ae1abe --- /dev/null +++ b/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 4f887cc665c9a48b83e20ef4abe57afa7e365e0e Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@eng.windriver.com> | ||
3 | Date: Tue, 5 Dec 2023 23:02:22 -0800 | ||
4 | Subject: [PATCH v2] fix compile procan.c failed | ||
5 | |||
6 | 1. Compile socat failed if out of tree build (build dir != source dir) | ||
7 | ... | ||
8 | gcc -c -D CC="gcc" -o procan.o procan.c | ||
9 | cc1: fatal error: procan.c: No such file or directory | ||
10 | ... | ||
11 | Explicitly add $srcdir to makefile rule | ||
12 | |||
13 | 2. Compile socat failed if multiple words in $(CC), such as CC="gcc -m64" | ||
14 | ... | ||
15 | from ../socat-1.8.0.0/procan.c:10: | ||
16 | ../socat-1.8.0.0/sysincludes.h:18:10: fatal error: inttypes.h: No such file or directory | ||
17 | 18 | #include <inttypes.h> /* uint16_t */ | ||
18 | ... | ||
19 | |||
20 | In commit [Procan: print umask, CC, and couple more new infos][1], | ||
21 | it defeines marcro CC in C source, the space in CC will break | ||
22 | C source compile. Use first word of $(CC) to defeine marco CC | ||
23 | |||
24 | [1] https://repo.or.cz/socat.git/commit/cd5673dbd0786c94e0b3ace7e35fab14c01e3185 | ||
25 | |||
26 | Upstream-Status: Submitted [socat@dest-unreach.org] | ||
27 | Signed-off-by: Hongxu Jia <hongxu.jia@eng.windriver.com> | ||
28 | --- | ||
29 | Makefile.in | 10 +++++----- | ||
30 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
31 | |||
32 | diff --git a/Makefile.in b/Makefile.in | ||
33 | index c01b1a4..48dad69 100644 | ||
34 | --- a/Makefile.in | ||
35 | +++ b/Makefile.in | ||
36 | @@ -109,8 +109,8 @@ depend: $(CFILES) $(HFILES) | ||
37 | socat: socat.o libxio.a | ||
38 | $(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS) | ||
39 | |||
40 | -procan.o: procan.c | ||
41 | - $(CC) $(CFLAGS) -c -D CC=\"$(CC)\" -o $@ procan.c | ||
42 | +procan.o: $(srcdir)/procan.c | ||
43 | + $(CC) $(CFLAGS) -c -D CC=\"$(firstword $(CC))\" -o $@ $(srcdir)/procan.c | ||
44 | |||
45 | PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o | ||
46 | procan: $(PROCAN_OBJS) | ||
47 | @@ -132,9 +132,9 @@ install: progs $(srcdir)/doc/socat.1 | ||
48 | mkdir -p $(DESTDIR)$(BINDEST) | ||
49 | $(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)/socat1 | ||
50 | ln -sf socat1 $(DESTDIR)$(BINDEST)/socat | ||
51 | - $(INSTALL) -m 755 socat-chain.sh $(DESTDIR)$(BINDEST) | ||
52 | - $(INSTALL) -m 755 socat-mux.sh $(DESTDIR)$(BINDEST) | ||
53 | - $(INSTALL) -m 755 socat-broker.sh $(DESTDIR)$(BINDEST) | ||
54 | + $(INSTALL) -m 755 $(srcdir)/socat-chain.sh $(DESTDIR)$(BINDEST) | ||
55 | + $(INSTALL) -m 755 $(srcdir)/socat-mux.sh $(DESTDIR)$(BINDEST) | ||
56 | + $(INSTALL) -m 755 $(srcdir)/socat-broker.sh $(DESTDIR)$(BINDEST) | ||
57 | $(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST) | ||
58 | $(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST) | ||
59 | mkdir -p $(DESTDIR)$(MANDEST)/man1 | ||
60 | -- | ||
61 | 2.42.0 | ||
62 | |||
diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.4.bb b/meta/recipes-connectivity/socat/socat_1.8.0.0.bb index 5a379380d1..912605c95c 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.4.4.bb +++ b/meta/recipes-connectivity/socat/socat_1.8.0.0.bb | |||
@@ -7,11 +7,13 @@ SECTION = "console/network" | |||
7 | 7 | ||
8 | LICENSE = "GPL-2.0-with-OpenSSL-exception" | 8 | 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=241;endline=271;md5=338c05eadd013872abb1d6e198e10a3f" |
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-fix-compile-procan.c-failed.patch \ | ||
14 | " | ||
13 | 15 | ||
14 | SRC_URI[sha256sum] = "fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac" | 16 | SRC_URI[sha256sum] = "e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7" |
15 | 17 | ||
16 | inherit autotools | 18 | inherit autotools |
17 | 19 | ||