ltrace: fix build without USE_DEMANGLE

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

2 files changed, 31 insertions, 4 deletions

diff --git a/CHANGES b/CHANGES
index a67effe58..6600eeeb8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,10 +20,10 @@
 	dropbear, e2fsprogs, fbv, file, flex, fontconfig, gawk,
 	gstreamer, gzip, intltool, ipsec-tools, iptables, libart,
 	libcgi, libdrm, libfuse, libgpg-error, libidn, liblockfile,
-	libpng, lighttpd, links, linux-fusion, lmbench, lrzsz, make,
-	module-init-tools, mysql_client, nbd, ncurses, neon, netcat,
-	netperf, ntfsprogs, openssl, php, qt, quagga, sqlite, sdl,
-	sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,
+	libpng, lighttpd, links, linux-fusion, lmbench, lrzsz, ltrace,
+	make, module-init-tools, mysql_client, nbd, ncurses, neon,
+	netcat, netperf, ntfsprogs, openssl, php, qt, quagga, sqlite,
+	sdl, sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,
 	usbutils, xkeyboard-config, xserver_xorg-server, xvkbd
 
 	Removed packages: modutils, portage, rxvt
diff --git a/package/ltrace/ltrace-0.5-fix-build-without-USE_DEMANGLE.patch b/package/ltrace/ltrace-0.5-fix-build-without-USE_DEMANGLE.patch
new file mode 100644
index 000000000..180f68834
--- /dev/null
+++ b/package/ltrace/ltrace-0.5-fix-build-without-USE_DEMANGLE.patch
@@ -0,0 +1,27 @@
+[PATCH] ltrace: fix build when USE_DEMANGLE isn't enabled
+
+summary.c unconditionally calls my_demangle(), which is only available
+when USE_DEMANGLE is enabled (which requires libiberty).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ summary.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: ltrace-0.5/summary.c
+===================================================================
+--- ltrace-0.5.orig/summary.c
++++ ltrace-0.5/summary.c
+@@ -83,7 +83,12 @@ void show_summary(void)
+ 		       (int)entries[i].tv.tv_sec, (int)entries[i].tv.tv_usec,
+ 		       (unsigned long int)(c / entries[i].count),
+ 		       entries[i].count,
++#ifdef USE_DEMANGLE
+ 		       opt_C ? my_demangle(entries[i].name) : entries[i].name);
++#else
++		       entries[i].name);
++#endif
++
+ 	}
+ 	printf
+ 	    ("------ ----------- ----------- --------- --------------------\n");