debian/changelog | 5 +++++ debian/control | 3 ++- debian/rules | 18 +++++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-)
New commits: commit 4e5d3c15b70ed5027cd8d38ef35c4b4f5486856f Author: Julien Cristau <[email protected]> Date: Sun Mar 21 16:49:01 2010 +0100 Don't build xserver-xorg-core-udeb on sparc. The linker fails because relocations have to be truncated when building statically against libnettle. diff --git a/debian/changelog b/debian/changelog index fe9b157..6943eeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ xorg-server (2:1.7.6-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream release, closes: #574354. + [ Julien Cristau ] + * Don't build xserver-xorg-core-udeb on sparc. The linker fails because + relocations have to be truncated when building statically against + libnettle. + -- Brice Goglin <[email protected]> Tue, 16 Mar 2010 08:06:29 +0100 xorg-server (2:1.7.5.902-1) unstable; urgency=low diff --git a/debian/control b/debian/control index cb940b3..b6820ae 100644 --- a/debian/control +++ b/debian/control @@ -129,7 +129,8 @@ Description: Xorg X server - core server Package: xserver-xorg-core-udeb XC-Package-Type: udeb Section: debian-installer -Architecture: any +# exclude sparc because of linker errors +Architecture: alpha amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 Depends: # merged: xserver-common (>= ${source:Version}), xkb-data-udeb, diff --git a/debian/rules b/debian/rules index 649935c..be4dbb7 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,10 @@ else confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif +ifneq (, $(filter %-udeb, $(shell dh_listpackages -s))) + udeb = yes +endif + ifeq ($(DEB_HOST_ARCH_OS), linux) build_xfbdev = --enable-xfbdev selinux = --enable-xselinux @@ -189,8 +193,12 @@ $(STAMP_DIR)/tests-%: $(STAMP_DIR)/build-% cd build-$* && $(MAKE) check >$@ -build: $(STAMP_DIR)/build-main $(STAMP_DIR)/build-udeb -build: $(STAMP_DIR)/tests-main $(STAMP_DIR)/tests-udeb +build: $(STAMP_DIR)/build-main +build: $(STAMP_DIR)/tests-main +ifeq ($(udeb), yes) +build: $(STAMP_DIR)/build-udeb +build: $(STAMP_DIR)/tests-udeb +endif clean: xsfclean dh_testdir @@ -216,14 +224,16 @@ install: build dh_installdirs cd build-main && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/main install +ifeq ($(udeb), yes) cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/udeb install +endif # oh, yuck. find debian/tmp/*/usr/lib/xorg -type f -name '*.la' | \ xargs rm -f # remove modules not needed in d-i - rm -r debian/tmp/udeb/usr/lib/xorg/modules/multimedia + rm -rf debian/tmp/udeb/usr/lib/xorg/modules/multimedia rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxaa.so rm -f debian/tmp/udeb/usr/lib/xorg/modules/libexa.so rm -f debian/tmp/udeb/usr/lib/xorg/modules/libwfb.so @@ -267,9 +277,11 @@ binary-arch: build install ifeq ($(DEB_HOST_ARCH_OS), linux) install -d debian/xserver-xorg-core/lib/udev/rules.d install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d +ifeq ($(udeb), yes) install -d debian/xserver-xorg-core-udeb/lib/udev/rules.d install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d endif +endif dh_installdebconf -s dh_installman -s dh_link -s -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
