debian/README.source | 2 +-
debian/changelog | 6 ++++++
debian/rules | 10 +++++++++-
debian/xsfbs/xsfbs.mk | 13 +++++++------
4 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit bff5734665a9a09a2b5d63f61521a1188dcb5a20
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Apr 14 05:34:21 2010 +0200
Add support for “noudeb” in DEB_BUILD_OPTIONS.
diff --git a/debian/changelog b/debian/changelog
index 542e2ca..5c50186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ xorg-server (2:1.7.6-3) UNRELEASED; urgency=low
thanks to Bryce Harrington.
* Merge 'xsfbs/debian-unstable' to fix target dependencies, which fixes
useless rebuilds.
+ * Add support for “noudeb” in DEB_BUILD_OPTIONS to disable building the
+ udeb flavour (even on architectures where udebs are supposed to be
+ built) to speed up debug builds. When this is used, the udeb is still
+ built, but rather empty…
-- Cyril Brulebois <k...@debian.org> Mon, 05 Apr 2010 20:25:26 +0200
diff --git a/debian/rules b/debian/rules
index be4dbb7..09e5995 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,10 +32,18 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+# udeb is arch-dependent...
ifneq (, $(filter %-udeb, $(shell dh_listpackages -s)))
udeb = yes
endif
+# ...but let's support disabling it to speed up debug builds:
+ifneq (,$(filter noudeb,$(DEB_BUILD_OPTIONS)))
+ udeb =
+ DH_INSTALL_OPTIONS = -Nxserver-xorg-core-udeb
+endif
+
+
ifeq ($(DEB_HOST_ARCH_OS), linux)
build_xfbdev = --enable-xfbdev
selinux = --enable-xselinux
@@ -264,7 +272,7 @@ binary-arch: build install
dh_installdocs -s
dh_installchangelogs -s ChangeLog
- dh_install -s --sourcedir=debian/tmp --list-missing
+ dh_install $(DH_INSTALL_OPTIONS) -s --sourcedir=debian/tmp
--list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
$(INSTALL) -m644 $(CURDIR)/debian/videoabiver \
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/videoabiver
commit 9261c88fa0aff84a1138f4c184949d13e96ad2bb
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Apr 14 05:04:49 2010 +0200
Document the xsfbs/debian-unstable merge.
diff --git a/debian/changelog b/debian/changelog
index b4e1756..542e2ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xorg-server (2:1.7.6-3) UNRELEASED; urgency=low
applied in Debian as well. It fixes arithmetic bugs in mod(), which
could lead to X crashes/exploits when XAA and compositing are used;
thanks to Bryce Harrington.
+ * Merge 'xsfbs/debian-unstable' to fix target dependencies, which fixes
+ useless rebuilds.
-- Cyril Brulebois <k...@debian.org> Mon, 05 Apr 2010 20:25:26 +0200
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*"
branch.
Otherwise, the upstream sources are manually installed in the Debian
git repository.
-The .orig.tar.gz upstream source file could be generated this
+The .orig.tar.gz upstream source file could be generated using this
"upstream-*" branch in the Debian git repository but it is actually
copied from upstream tarballs directly.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o20ao-0003bd...@alioth.debian.org
