Source: xprobe
Version: 0.3-3
Tags: patch upstream
User: helm...@debian.org
Usertags: rebootstrap
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. Please consider applying it.
Helmut
--- 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}
