Package: xprobe / 0.3-4

cross.patch Patch series | download
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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
Description: Fix cross-build of the package
 xprobe fails to cross build from source, because it does not propagate
 the C++ cross compiler, that is correctedly detected by ./configure, to
 the various sub Makefiles. The cause quite simply is a missing variable
 substitution. Close to the end, it runs the build architecture strip.
 Stripping is bad, because it also breaks generation of -dbgsym packages.
 The attached patch adds the missing interpolations and removes the strip
 call. It makes xprobe cross buildable.
Author: Helmut Grohne <helmut@subdivi.de>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906298

--- xprobe-0.3.orig/src/xpmodules/alive_probe/Makefile.in
+++ xprobe-0.3/src/xpmodules/alive_probe/Makefile.in
@@ -18,6 +18,7 @@
 
 
 CC=@CC@
+CXX=@CXX@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
--- xprobe-0.3.orig/src/xpmodules/os_probe/tcp_rst/Makefile.in
+++ xprobe-0.3/src/xpmodules/os_probe/tcp_rst/Makefile.in
@@ -18,6 +18,7 @@
 
 
 CC=@CC@
+CXX=@CXX@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
--- xprobe-0.3.orig/src/xpmodules/os_probe/tcp_handshake/Makefile.in
+++ xprobe-0.3/src/xpmodules/os_probe/tcp_handshake/Makefile.in
@@ -18,6 +18,7 @@
 
 
 CC=@CC@
+CXX=@CXX@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
--- xprobe-0.3.orig/src/xpmodules/os_probe/icmp_addrmask/Makefile.in
+++ xprobe-0.3/src/xpmodules/os_probe/icmp_addrmask/Makefile.in
@@ -18,6 +18,7 @@
 
 
 CC=@CC@
+CXX=@CXX@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
--- xprobe-0.3.orig/src/xpmodules/os_probe/icmp_echo_id/Makefile.in
+++ xprobe-0.3/src/xpmodules/os_probe/icmp_echo_id/Makefile.in
@@ -18,6 +18,7 @@
 
 
 CC=@CC@
+CXX=@CXX@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
--- xprobe-0.3.orig/src/xpmodules/os_probe/icmp_inforeq/Makefile.in
+++ xprobe-0.3/src/xpmodules/os_probe/icmp_inforeq/Makefile.in
@@ -18,6 +18,7 @@
 
 
 CC=@CC@
+CXX=@CXX@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
--- xprobe-0.3.orig/src/xpmodules/os_probe/icmp_timestamp/Makefile.in
+++ xprobe-0.3/src/xpmodules/os_probe/icmp_timestamp/Makefile.in
@@ -18,6 +18,7 @@
 
 
 CC=@CC@
+CXX=@CXX@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
--- xprobe-0.3.orig/src/Makefile.in
+++ xprobe-0.3/src/Makefile.in
@@ -49,7 +49,6 @@
 
 xprobe2: $(OBJS) modules
 	$(CXX) $(CFLAGS) $(OBJS) $(MODOBJS) -o $@ $(LDFLAGS) $(LIBS)
-	strip $@    
 
 modules:
 	cd xpmodules; ${MAKE}