X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c7a7271840cfc92d447f73d9a3b8ee146532b893..6d7fc45ed4e22163bba6478c7523f4509d200c58:/debian/rules diff --git a/debian/rules b/debian/rules index 1b3782ab6..ce7d19dec 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ export NOISY=1 export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +export PARALLEL = $(or $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))),1) # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) @@ -17,13 +18,19 @@ else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif +# Set the number of procs to be run in parallel from the options. +confflags += --with-procs=$(PARALLEL) + # See below -include build/environment.mak ifneq (,$(shell which dpkg-buildflags)) - export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) - export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) - export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) + # make does not export to $(shell) so we need to workaround + # (http://savannah.gnu.org/bugs/?10593) + dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags + export CXXFLAGS = $(shell $(dpkg_buildflags) --get CXXFLAGS) + export LDFLAGS = $(shell $(dpkg_buildflags) --get LDFLAGS) + export CPPFLAGS = $(shell $(dpkg_buildflags) --get CPPFLAGS) else ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) export CXXFLAGS = -O0 -g -Wall @@ -53,6 +60,11 @@ ifeq ($(words $(BLD)),0) override BLD := ./build endif +# When building without , the header is available and thus the test is +# successful. When building with , the header is missing, but we still +# pretend it to be available, because configure would fail otherwise. +export ac_cv_header_gtest_gtest_h=yes + # APT Programs in apt-utils APT_UTILS=ftparchive sortpkgs extracttemplates @@ -70,7 +82,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) export DPKG_GENSYMBOLS_CHECK_LEVEL=0 build-binary: build/build-binary-stamp -build-debiandoc: build/build-debiandoc-stamp +build-docbook: build/build-docbook-stamp build-manpages: build/build-manpages-stamp # Note that this is unconditionally done first as part of loading environment.mak @@ -82,7 +94,7 @@ build/environment.mak: build/configure-stamp configure: configure.ac build/configure-stamp: configure buildlib/config.sub buildlib/config.guess dh_testdir - -mkdir build + mkdir -p build cp COPYING debian/copyright cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ @@ -101,9 +113,9 @@ else endif touch $@ -build/build-debiandoc-stamp: build/configure-stamp +build/build-docbook-stamp: build/configure-stamp # Add here commands to compile the package. - $(MAKE) debiandoc + $(MAKE) docbook touch $@ build/build-manpages-stamp: build/configure-stamp @@ -126,7 +138,7 @@ debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ # Build architecture-independent files here. -libapt-pkg-doc: build-debiandoc +libapt-pkg-doc: build-docbook dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -153,7 +165,7 @@ libapt-pkg-doc: build-debiandoc dh_md5sums -p$@ dh_builddeb -p$@ -apt-doc: build-debiandoc +apt-doc: build-docbook dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -189,6 +201,8 @@ apt: build-binary build-manpages debian/apt.install cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal + # install vendor specific apt confs + find -L vendor/current -name 'apt.conf-*' | while read conf; do cp "$${conf}" "debian/$@/etc/apt/apt.conf.d/$${conf#*-}"; done # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir @@ -207,6 +221,9 @@ apt: build-binary build-manpages debian/apt.install #mv debian/$@/usr/bin/apt-report-mirror-failure \ # debian/$@/usr/lib/apt/apt-report-mirror-failure \ + # move the apt-helper in place + mv debian/$@/usr/bin/apt-helper debian/$@/usr/lib/apt/apt-helper + dh_bugfiles -p$@ dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* @@ -346,7 +363,7 @@ binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-trans binary-indep: apt-doc libapt-pkg-doc binary: binary-indep binary-arch build-arch: build-binary -build-indep: build-manpages build-debiandoc +build-indep: build-manpages build-docbook build: build-indep build-arch .PHONY: build clean binary-indep binary-arch binary