X Strike Force XFree86 SVN commit: r1320 - in people/fabbione/trunk/debian: . patches
Author: fabbione
Date: 2004-04-27 10:27:22 -0500 (Tue, 27 Apr 2004)
New Revision: 1320
Added:
people/fabbione/trunk/debian/patches/914_debian_donot_build_fonts
Modified:
people/fabbione/trunk/debian/rules
Log:
Do not build fonts when build is triggered via dpkg-buildpackage -B
(common to all buildd)
Added: people/fabbione/trunk/debian/patches/914_debian_donot_build_fonts
===================================================================
--- people/fabbione/trunk/debian/patches/914_debian_donot_build_fonts 2004-04-27 10:38:22 UTC (rev 1319)
+++ people/fabbione/trunk/debian/patches/914_debian_donot_build_fonts 2004-04-27 15:27:22 UTC (rev 1320)
@@ -0,0 +1,23 @@
+diff -Nur xc.orig/Makefile xc/Makefile
+--- xc.orig/Makefile 2003-02-27 06:33:58.000000000 +0000
++++ xc/Makefile 2004-04-27 06:12:39.000000000 +0000
+@@ -63,14 +63,13 @@
+ @if [ ! -f $(IRULESRC)/host.def ]; then \
+ if [ ! -f $(TOP)/lib/Xt/Imakefile ]; then \
+ echo "#define BuildServersOnly YES" > $(IRULESRC)/host.def; \
+- else \
+- if [ ! -f $(TOP)/fonts/Imakefile ]; then \
+- echo "#define BuildFonts NO" > $(IRULESRC)/host.def; \
+- else \
+- echo "" > $(IRULESRC)/host.def; \
+- fi; \
+ fi; \
+ fi
++ if [ ! -f $(TOP)/fonts/Imakefile ]; then \
++ echo "#define BuildFonts NO" > $(IRULESRC)/host.def; \
++ else \
++ echo "" > $(IRULESRC)/host.def; \
++ fi
+ @if [ ! -f $(IRULESRC)/version.def ]; then \
+ echo "" > $(IRULESRC)/version.def; \
+ fi
Modified: people/fabbione/trunk/debian/rules
===================================================================
--- people/fabbione/trunk/debian/rules 2004-04-27 10:38:22 UTC (rev 1319)
+++ people/fabbione/trunk/debian/rules 2004-04-27 15:27:22 UTC (rev 1320)
@@ -137,7 +137,7 @@
dh_testdir
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
perl $(SCRIPT_DIR)/dbs_split clean
- rm -rf imports debian/local/xlibmesa-drm-source/modules
+ rm -rf imports debian/local/xlibmesa-drm-source/modules debian/build-fonts
dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz \
debian/MANIFEST.$(ARCH).new debian/shlibs.local
@@ -201,9 +201,13 @@
touch $@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build-server RULE BELOW
-build: $(STAMP_DIR)/stamp-build
+real-build: $(STAMP_DIR)/stamp-build
$(STAMP_DIR)/stamp-build: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/genscripts
dh_testdir
+ # check if we need to build fonts
+ if [ ! -e debian/build-fonts ]; then \
+ mv -f $(SOURCE_TREE)/fonts/Imakefile $(SOURCE_TREE)/fonts/Imakefile.removed; \
+ fi
# Symlink some of the libraries on which we build-depend into
# imports/{lib,include} so we don't have to pull in -L/usr/include and
# other, similarly ugly, stuff (including, but not limited to,
@@ -239,6 +243,10 @@
else
# skipping build rule because test_rules was defined
endif
+ # put back the Imakefile
+ if [ ! -e debian/build-fonts ]; then \
+ mv -f $(SOURCE_TREE)/fonts/Imakefile.removed $(SOURCE_TREE)/fonts/Imakefile; \
+ fi
touch $@
# At present we don't support invoking the build in different ways based on
@@ -246,9 +254,17 @@
#
# When we do, we'll probably add "-DBuildAllSpecsDocs=NO -DBuildFonts=NO" to
# $(IMAKE_DEFINES).
-build-arch: build
-build-indep: build
+build:
+ # do nothing. build-indep and build-arch will be called by binary-* targets.
+ # Policy allows us to do so.
+
+build-fonts:
+ touch debian/build-fonts
+
+build-arch: real-build
+build-indep: build-fonts real-build
+
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE install-server RULE BELOW
install: $(STAMP_DIR)/install
$(STAMP_DIR)/install: $(STAMP_DIR)/stamp-build
@@ -347,7 +363,7 @@
binary-indep: $(STAMP_DIR)/binary-indep
$(STAMP_DIR)/binary-indep: DH_OPTIONS=-i
-$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/stamp-build $(STAMP_DIR)/install
+$(STAMP_DIR)/binary-indep: build-indep $(STAMP_DIR)/install
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -379,7 +395,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE binary-server RULE BELOW
binary-arch: $(STAMP_DIR)/binary-arch
$(STAMP_DIR)/binary-arch: DH_OPTIONS=-s
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/stamp-build $(STAMP_DIR)/install debian/shlibs.local
+$(STAMP_DIR)/binary-arch: build-arch $(STAMP_DIR)/install debian/shlibs.local
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -454,7 +470,7 @@
dh_builddeb
touch $@
-binary: binary-arch binary-indep
+binary: binary-indep binary-arch
# Use 'debian/rules environment' to help debug architecture-related problems
# with the rules file.
Reply to: