From 8cf3006167b0d48de8da96c475785549fbb1ad07 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Sun, 5 Apr 2015 10:33:39 +0800 Subject: Disable icu for udeb --- debian/rules | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/debian/rules b/debian/rules index 54416c6..8264b07 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ DH_OPTIONS += -Npython-libxml2 -Npython-libxml2-dbg export DH_OPTIONS endif -CONFIGURE_FLAGS := --disable-silent-rules --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/builddir/config.cache" --with-icu +CONFIGURE_FLAGS := --disable-silent-rules --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/builddir/config.cache" override_dh_auto_configure: $(TARGETS:%=doconfigure-%) @@ -42,12 +42,10 @@ debian/autoreconf.after: doconfigure-%: debian/autoreconf.after dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS) -doconfigure-main: CONFIGURE_FLAGS += --without-python +doconfigure-main: CONFIGURE_FLAGS += --without-python --with-icu doconfigure-python%: CONFIGURE_FLAGS += --with-python=/usr/bin/$* #doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-minimum --with-tree --with-output -doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-tree --with-output --without-python - -override_dh_auto_build: $(TARGETS:%=dobuild-%) +doconfigure-udeb: CONFIGURE_FLAGS += --without-history --with-tree --with-output --without-python --without-icu dobuild-%: BUILD_DIR=builddir/$* dobuild-%: doconfigure-% @@ -62,6 +60,8 @@ dobuild-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES="$(shell $(DEB_HOST_GNU_TYPE PYTHON_LIBS="$(shell $(DEB_HOST_GNU_TYPE)-python-dbg-config --ldflags)" \ CFLAGS="$(CFLAGS) -Wall -g -O0" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) \ -L$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" + +#override_dh_auto_build: $(TARGETS:%=dobuild-%) build-arch: $(TARGETS:%=dobuild-%) build-indep: build: build-arch build-indep @@ -76,7 +76,6 @@ override_dh_auto_install: $(TARGETS:%=doinstall-%) doinstall-main: dh_auto_install --builddirectory=builddir/main mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4 - # Properly install documentation in /usr/share/doc/libxml2-doc install -d debian/tmp/usr/share/doc/libxml2-doc/examples install -m 644 \ @@ -143,7 +142,5 @@ override_dh_makeshlibs: ifeq ($(DEB_BUILD_PROFILE),stage1) dh $@ --with autoreconf else - dh $@ --with autoreconf,python2 + dh $@ --parallel --with autoreconf,python2 endif - - -- cgit v1.2.3