diff options
author | James McCoy <jamessan@debian.org> | 2022-06-06 06:37:05 -0400 |
---|---|---|
committer | James McCoy <jamessan@debian.org> | 2022-06-06 11:55:27 -0400 |
commit | d2e1ca0801d6587fd8c4fa8b1b8f3c544fb75178 (patch) | |
tree | 85a58733a6ff85ff0f78235b33835735b5bee322 | |
parent | d90eca2ab56fb192e6a3fc1fa781113a4718bdad (diff) |
Fix handling of verbose/terse build logs
Signed-off-by: James McCoy <jamessan@debian.org>
-rwxr-xr-x | debian/rules | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/debian/rules b/debian/rules index 7231208..d677c0f 100755 --- a/debian/rules +++ b/debian/rules @@ -77,9 +77,9 @@ $(foreach o, $(d_b_o), \ $(foreach o, $(filter NO_%,$(d_b_o)), $(eval DEB_OPT_$(subst NO_,WITH_,$o) :=)) $(if $(DEB_OPT_PARALLEL),$(eval MAKEFLAGS += -j$(DEB_OPT_PARALLEL))) +MAKE_B = $(MAKE) -C $(DEB_BUILDDIR) ifndef DEB_OPT_TERSE - export LTFLAGS = --tag=CC - export LTCXXFLAGS = --tag=CXX + MAKE_B += LTFLAGS="--tag=CC --verbose" LTCXXFLAGS="--tag=CXX --verbose" endif export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS @@ -206,8 +206,8 @@ override_dh_auto_configure: # Ensure we're able to regenerate the swig bindings, in case we need to # patch them. - $(MAKE) -C $(DEB_BUILDDIR) mkdir-init - $(MAKE) -C $(DEB_BUILDDIR) extraclean-bindings + $(MAKE_B) mkdir-init + $(MAKE_B) extraclean-bindings ifdef DEB_OPT_WITH_PYTHON for v in $(PYVERSIONS); do \ cp -la $(PY_DIR) $(PY_DIR)$$v; \ @@ -241,44 +241,44 @@ check: fi check-swig-rb check-javahl: - $(MAKE) -C $(DEB_BUILDDIR) $@ $(check_defs) PARALLEL=$(DEB_OPT_PARALLEL) + $(MAKE_B) $@ $(check_defs) PARALLEL=$(DEB_OPT_PARALLEL) check-swig-pl: - $(MAKE) -C $(DEB_BUILDDIR) $@ MAN3EXT=3perl $(check_defs) - $(MAKE) -C $(PERL_DIR) test MAN3EXT=3perl LC_ALL=C + $(MAKE_B) $@ MAN3EXT=3perl $(check_defs) + $(MAKE) -C $(PERL_DIR) test MAN3EXT=3perl LC_ALL=C check-swig-py: $(call allpy, \ - $(MAKE) -C $(DEB_BUILDDIR) $@ PYTHON=python$$v PYVER=$$v $(check_defs)) + $(MAKE_B) $@ PYTHON=python$$v PYVER=$$v $(check_defs)) override_dh_auto_build-arch: $(DONT_BE_ROOT) # note: autogen-swig does not support -jN ifdef DEB_OPT_WITH_PYTHON - $(call allpy, $(MAKE) -C $(DEB_BUILDDIR) -j1 autogen-swig-py) + $(call allpy, $(MAKE_B) -j1 autogen-swig-py) endif - $(MAKE) -C $(DEB_BUILDDIR) -j1 autogen-swig-pl + $(MAKE_B) -j1 autogen-swig-pl ifdef DEB_OPT_WITH_RUBY - $(MAKE) -C $(DEB_BUILDDIR) -j1 autogen-swig-rb + $(MAKE_B) -j1 autogen-swig-rb endif - $(MAKE) -C $(DEB_BUILDDIR) all tools + $(MAKE_B) all tools # Run svn once, to make sure it populates $(HOME)/.subversion/* env LD_LIBRARY_PATH="$(AUTH_LIB_DIRS):$(LD_LIBRARY_PATH)" $(DEB_BUILDDIR)/subversion/svn/svn --version > /dev/null ifdef DEB_OPT_WITH_PYTHON $(call allpy, \ - $(MAKE) -C $(DEB_BUILDDIR) swig-py PYTHON=python$$v PYVER=$$v \ + $(MAKE_B) swig-py PYTHON=python$$v PYVER=$$v \ PYTHON_INCLUDES="$$pyinc" \ swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn) endif # note: swig-pl seems to have trouble with -jN - $(MAKE) -C $(DEB_BUILDDIR) -j1 swig-pl MAN3EXT=3perl + $(MAKE_B) -j1 swig-pl MAN3EXT=3perl $(MAKE) -C $(PERL_DIR) all \ MAN3EXT=3perl OPTIMIZE="-g -Wall $(CFLAGS)" ifdef DEB_OPT_WITH_RUBY - $(MAKE) -C $(DEB_BUILDDIR) swig-rb $(rb_defs) + $(MAKE_B) swig-rb $(rb_defs) endif ifdef DEB_OPT_WITH_JAVAHL - $(MAKE) -C $(DEB_BUILDDIR) -j1 javahl + $(MAKE_B) -j1 javahl endif override_dh_auto_build-indep: @@ -303,13 +303,13 @@ override_dh_auto_install-indep: PRIVATE_LIBS = auth_gnome_keyring auth_kwallet fs_base fs_fs fs_util fs_x ra_local ra_serf swig_perl $(foreach v, $(PYVERSIONS), swig_py$(v)) swig_ruby override_dh_auto_install-arch: - $(MAKE) -C $(DEB_BUILDDIR) -j1 local-install install-tools \ + $(MAKE_B) -j1 local-install install-tools \ DESTDIR=$(CURDIR)/debian/tmp toolsdir=/usr/bin pkgconfig_dir=$(libdir)/pkgconfig ifdef DEB_OPT_WITH_PYTHON $(call allpy, \ set -e; \ - $(MAKE) -C $(DEB_BUILDDIR) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \ + $(MAKE_B) install-swig-py DESTDIR=$(CURDIR)/debian/tmp \ PYTHON=python$$v PYVER=$$v \ swig_pydir=$$pylib/libsvn swig_pydir_extra=$$pylib/svn; \ for ext in debian/tmp/usr/lib/python3/dist-packages/libsvn/*.so; do \ @@ -321,19 +321,19 @@ ifdef DEB_OPT_WITH_PYTHON endif ifdef DEB_OPT_WITH_JAVAHL - $(MAKE) -C $(DEB_BUILDDIR) install-javahl install-javahl-java \ + $(MAKE_B) install-javahl install-javahl-java \ DESTDIR=$(CURDIR)/debian/tmp \ javahl_javadir=/usr/share/java \ javahl_javahdir=/usr/include/svn-javahl endif - $(MAKE) -C $(DEB_BUILDDIR) install-swig-pl-lib \ + $(MAKE_B) install-swig-pl-lib \ DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C $(PERL_DIR) install \ MAN3EXT=3perl DESTDIR=$(CURDIR)/debian/tmp INSTALLDIRS=vendor ifdef DEB_OPT_WITH_RUBY - $(MAKE) -C $(DEB_BUILDDIR) install-swig-rb $(rb_defs) \ + $(MAKE_B) install-swig-rb $(rb_defs) \ DESTDIR=$(CURDIR)/debian/tmp endif |