Codebase list spike / b074717
Fix build system with recent toolchain Resolves https://bugs.kali.org/view.php?id=7043 Raphaël Hertzog 3 years ago
1 changed file(s) with 55 addition(s) and 10 deletion(s). Raw diff Collapse all Expand all
+55
-10
debian/patches/fix-makefile.patch less more
0 Description: Do not use ld but $(CC) to link the library
1 Author: Raphaël Hertzog <[email protected]>
2 Last-Update: 2015-11-25
0 From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <[email protected]>
1 Date: Tue, 9 Feb 2021 17:23:30 +0100
2 Subject: Multiple make fixes
3
4 * Do not use ld but $(CC) to link the library
5 * Drop dlrpc.o and dlargs.o where -ldlrpc is passed as those objects are
6 built in the library... if we don't do this, then the applications ends
7 up not being linked against the library, yet some of the required
8 symbols are still provided by it.
9 * Ensure libdlrpc.so is linked against libdl which it uses.
10
11 Last-Update: 2021-02-09
312 ---
4 The information above should follow the Patch Tagging Guidelines, please
5 checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
6 are templates for supplementary fields that you might want to add:
13 src/Makefile.am | 16 ++++++++--------
14 1 file changed, 8 insertions(+), 8 deletions(-)
715
8 --- spike-2.9.orig/src/Makefile.in
9 +++ spike-2.9/src/Makefile.in
10 @@ -597,7 +597,7 @@ dltest: dltest.o dlrpc.o dlargs.o
16 diff --git a/src/Makefile.am b/src/Makefile.am
17 index 8fcc683..65fa2af 100755
18 --- a/src/Makefile.am
19 +++ b/src/Makefile.am
20 @@ -119,35 +119,35 @@ dltest: dltest.o dlrpc.o dlargs.o
1121
1222 #this next line may be less than portable
1323 libdlrpc.so: dlrpc.o dlargs.o $(SPIKE_OBS)
1424 - ld -shared -soname libdlrpc.so -o libdlrpc.so -lc dlrpc.o dlargs.o $(SPIKE_OBS)
15 + $(CC) -shared -Wl,-soname,libdlrpc.so -o libdlrpc.so -lc dlrpc.o dlargs.o $(SPIKE_OBS)
25 + $(CC) -shared -Wl,-soname,libdlrpc.so -o libdlrpc.so dlrpc.o dlargs.o $(SPIKE_OBS) $(DL_LIB)
1626
1727 generic_send_tcp: generic_send_tcp.o dlrpc.o dlargs.o $(SPIKE_OBS) libdlrpc.so
1828 export LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH)
29 - $(CC) -ggdb -o generic_send_tcp generic_send_tcp.o dlrpc.o dlargs.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
30 + $(CC) -ggdb -o generic_send_tcp generic_send_tcp.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
31
32 generic_listen_tcp: generic_listen_tcp.o dlrpc.o dlargs.o $(SPIKE_OBS) libdlrpc.so
33 export LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH)
34 - $(CC) -ggdb -o generic_listen_tcp generic_listen_tcp.o dlrpc.o dlargs.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
35 + $(CC) -ggdb -o generic_listen_tcp generic_listen_tcp.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
36
37 generic_web_server_fuzz: generic_web_server_fuzz.o dlrpc.o dlargs.o $(SPIKE_OBS) libdlrpc.so
38 export LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH)
39 - $(CC) -ggdb -o generic_web_server_fuzz generic_web_server_fuzz.o dlrpc.o dlargs.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
40 + $(CC) -ggdb -o generic_web_server_fuzz generic_web_server_fuzz.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
41
42 generic_web_server_fuzz2: generic_web_server_fuzz2.o dlrpc.o dlargs.o $(SPIKE_OBS) libdlrpc.so
43 export LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH)
44 - $(CC) -ggdb -o generic_web_server_fuzz2 generic_web_server_fuzz2.o dlrpc.o dlargs.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
45 + $(CC) -ggdb -o generic_web_server_fuzz2 generic_web_server_fuzz2.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
46
47 generic_chunked: generic_chunked.o dlargs.o $(SPIKE_OBS) libdlrpc.so
48 export LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH)
49 - $(CC) -ggdb -o generic_chunked generic_chunked.o dlrpc.o dlargs.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
50 + $(CC) -ggdb -o generic_chunked generic_chunked.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
51
52 generic_send_udp: generic_send_udp.o dlargs.o $(SPIKE_OBS) libdlrpc.so
53 export LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH)
54 - $(CC) -ggdb -o generic_send_udp generic_send_udp.o dlrpc.o dlargs.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
55 + $(CC) -ggdb -o generic_send_udp generic_send_udp.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
56
57 line_send_tcp: line_send_tcp.o dlargs.o $(SPIKE_OBS) libdlrpc.so
58 export LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH)
59 - $(CC) -ggdb -o line_send_tcp line_send_tcp.o dlrpc.o dlargs.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
60 + $(CC) -ggdb -o line_send_tcp line_send_tcp.o $(SPIKE_OBS) $(DL_LIB) -L. -ldlrpc
61
62
63 clean: