Skip to content

Commit d9b9f3d

Browse files
hongxurpurdie
authored andcommitted
scocat: upgrade 1.8.0.0 -> 1.8.0.1
Rebase 0001-fix-compile-procan.c-failed.patch to 1.8.0.1 Signed-off-by: Hongxu Jia <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
1 parent 181205d commit d9b9f3d

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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
1+
From c4c3d5f2d4dfe8167205e8d20b4cb7a197706c16 Mon Sep 17 00:00:00 2001
2+
From: Hongxu Jia <[email protected]>
3+
Date: Wed, 27 Nov 2024 04:09:59 -0800
4+
Subject: [PATCH] fix compile procan.c failed
55

66
1. Compile socat failed if out of tree build (build dir != source dir)
77
...
@@ -24,23 +24,23 @@ C source compile. Use first word of $(CC) to defeine marco CC
2424
[1] https://repo.or.cz/socat.git/commit/cd5673dbd0786c94e0b3ace7e35fab14c01e3185
2525

2626
Upstream-Status: Submitted [[email protected]]
27-
Signed-off-by: Hongxu Jia <[email protected]>
27+
28+
Rebase to 1.8.0.1
29+
Signed-off-by: Hongxu Jia <[email protected]>
2830
---
29-
Makefile.in | 10 +++++-----
30-
1 file changed, 5 insertions(+), 5 deletions(-)
31+
Makefile.in | 8 ++++----
32+
1 file changed, 4 insertions(+), 4 deletions(-)
3133

3234
diff --git a/Makefile.in b/Makefile.in
33-
index c01b1a4..48dad69 100644
35+
index 631d31d..103d4d1 100644
3436
--- a/Makefile.in
3537
+++ b/Makefile.in
36-
@@ -109,8 +109,8 @@ depend: $(CFILES) $(HFILES)
37-
socat: socat.o libxio.a
38+
@@ -110,7 +110,7 @@ socat: socat.o libxio.a
3839
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS)
3940

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
41+
procan.o: $(srcdir)/procan.c
42+
- $(CC) $(CFLAGS) -c -D CC="\"$(CC)\"" -o $@ $(srcdir)/procan.c
43+
+ $(CC) $(CFLAGS) -c -D CC="\"$(firstword $(CC))\"" -o $@ $(srcdir)/procan.c
4444

4545
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
4646
procan: $(PROCAN_OBJS)
@@ -58,5 +58,5 @@ index c01b1a4..48dad69 100644
5858
$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
5959
mkdir -p $(DESTDIR)$(MANDEST)/man1
6060
--
61-
2.42.0
61+
2.25.1
6262

meta/recipes-connectivity/socat/socat_1.8.0.0.bb renamed to meta/recipes-connectivity/socat/socat_1.8.0.1.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
1313
file://0001-fix-compile-procan.c-failed.patch \
1414
"
1515

16-
SRC_URI[sha256sum] = "e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7"
16+
SRC_URI[sha256sum] = "6a283565db7cf86292c6f70504c58abb03e29888adeed5a6c5f3457e803c1b81"
1717

1818
inherit autotools
1919

0 commit comments

Comments
 (0)