summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch
blob: ea00dfa0a9db3e6a4a824b5593a7e748b5074458 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
From c4c3d5f2d4dfe8167205e8d20b4cb7a197706c16 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 27 Nov 2024 04:09:59 -0800
Subject: [PATCH] fix compile procan.c failed

1. Compile socat failed if out of tree build (build dir != source dir)
...
gcc -c -D CC="gcc" -o procan.o procan.c
cc1: fatal error: procan.c: No such file or directory
...
Explicitly add $srcdir to makefile rule

2. Compile socat failed if multiple words in $(CC), such as CC="gcc -m64"
...
from ../socat-1.8.0.0/procan.c:10:
../socat-1.8.0.0/sysincludes.h:18:10: fatal error: inttypes.h: No such file or directory
   18 | #include <inttypes.h>   /* uint16_t */
...

In commit [Procan: print umask, CC, and couple more new infos][1],
it defeines marcro CC in C source, the space in CC will break
C source compile. Use first word of $(CC) to defeine marco CC

[1] https://repo.or.cz/socat.git/commit/cd5673dbd0786c94e0b3ace7e35fab14c01e3185

Upstream-Status: Submitted [socat@dest-unreach.org]

Rebase to 1.8.0.1
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 Makefile.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 631d31d..103d4d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -110,7 +110,7 @@ socat: socat.o libxio.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS)
 
 procan.o: $(srcdir)/procan.c
-	$(CC) $(CFLAGS) -c -D CC="\"$(CC)\"" -o $@ $(srcdir)/procan.c
+	$(CC) $(CFLAGS) -c -D CC="\"$(firstword $(CC))\"" -o $@ $(srcdir)/procan.c
 
 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
 procan: $(PROCAN_OBJS)
@@ -132,9 +132,9 @@ install: progs $(srcdir)/doc/socat.1
 	mkdir -p $(DESTDIR)$(BINDEST)
 	$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)/socat1
 	ln -sf socat1 $(DESTDIR)$(BINDEST)/socat
-	$(INSTALL) -m 755 socat-chain.sh  $(DESTDIR)$(BINDEST)
-	$(INSTALL) -m 755 socat-mux.sh    $(DESTDIR)$(BINDEST)
-	$(INSTALL) -m 755 socat-broker.sh $(DESTDIR)$(BINDEST)
+	$(INSTALL) -m 755 $(srcdir)/socat-chain.sh  $(DESTDIR)$(BINDEST)
+	$(INSTALL) -m 755 $(srcdir)/socat-mux.sh    $(DESTDIR)$(BINDEST)
+	$(INSTALL) -m 755 $(srcdir)/socat-broker.sh $(DESTDIR)$(BINDEST)
 	$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
 	$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
 	mkdir -p $(DESTDIR)$(MANDEST)/man1
-- 
2.25.1