Hi, While updating scratchbox2 for debian, I added the following changes.
Cheers, Riku
>From 75192c621e999a7b7de3e2865d828830be3f26f7 Mon Sep 17 00:00:00 2001 From: Riku Voipio <[email protected]> Date: Mon, 11 Jul 2011 12:22:35 +0300 Subject: [PATCH 1/2] Update debian recommends qemu usermode emulation is now in "qemu-user" packages, while build-essential and wget are needed for cross-libtool build. Signed-off-by: Riku Voipio <[email protected]> --- debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/control b/debian/control index d520090..8983c0d 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Homepage: http://www.freedesktop.org/wiki/Software/sbox2 Package: scratchbox2 Architecture: i386 amd64 powerpc ia64 Depends: ${shlibs:Depends}, libsb2 (= ${binary:Version}), fakeroot, realpath -Recommends: qemu +Recommends: qemu-user, build-essential, wget Suggests: sbrsh Description: Transparent cross compiling environment Scratchbox2 uses a LD_PRELOAD library to create a transparent cross compiling -- 1.7.4.1
>From c73954bf3f7ad703d3d04896c8084cf835be1849 Mon Sep 17 00:00:00 2001 From: Nigel Babu <[email protected]> Date: Tue, 12 Jul 2011 10:35:41 +0300 Subject: [PATCH 2/2] fix FTBFS with ld --as-needed Changed the ordering of libs in the Makefile in utils folder to fix https://bugs.launchpad.net/ubuntu/+source/scratchbox2/+bug/803195 --- utils/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/Makefile b/utils/Makefile index d4ba632..86f568e 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -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 @@ $(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W -Werror \ -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 -- 1.7.4.1
_______________________________________________ Scratchbox-devel mailing list [email protected] http://lists.scratchbox.org/cgi-bin/mailman/listinfo/scratchbox-devel
