Package: scratchbox2
Version: 2.2.2-2
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu maverick ubuntu-patch

Updated the make file to work with new --as-needed change

*** /tmp/tmpHTpg4_
In Ubuntu, we've applied the attached patch to achieve the following:

  * Fixed FTBFS.

We thought you might be interested in doing the same. 


-- System Information:
Debian Release: squeeze/sid
  APT prefers lucid-updates
  APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 
'lucid-proposed'), (500, 'lucid-backports'), (500, 'lucid')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-33-generic (SMP w/2 CPU cores)
Locale: LANG=en_IN, LC_CTYPE=en_IN (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru scratchbox2-2.2.2/debian/changelog scratchbox2-2.2.2/debian/changelog
diff -Nru scratchbox2-2.2.2/utils/Makefile scratchbox2-2.2.2/utils/Makefile
--- scratchbox2-2.2.2/utils/Makefile	2011-04-01 00:22:03.000000000 +0530
+++ scratchbox2-2.2.2/utils/Makefile	2011-06-29 21:43:37.000000000 +0530
@@ -3,13 +3,13 @@
 
 $(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W -Werror \
 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
-		-I$(SRCDIR)/include -ldl
+		-I$(SRCDIR)/include
 
 $(D)/sb2-show.o: preload/exported.h
 $(D)/sb2-show: $(D)/sb2-show.o
 	$(MKOUTPUTDIR)
 	$(P)LD
-	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl
 
 
 $(D)/sb2-monitor: CFLAGS := $(CFLAGS) -Wall -W -Werror \
@@ -25,7 +25,7 @@
 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
 		-I$(SRCDIR)/include
 
-$(D)/sb2-interp-wrapper: preload/libsb2.$(SHLIBEXT) $(D)/sb2-interp-wrapper.o
+$(D)/sb2-interp-wrapper: $(D)/sb2-interp-wrapper.o preload/libsb2.$(SHLIBEXT)
 	$(MKOUTPUTDIR)
 	$(P)LD
 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl

Reply via email to