[Reproducible-commits] [cdbs] 02/41: Tidy snippets: wrap+strip wide lines, and strip trailing whitespace.
Mattia Rizzolo
mattia at debian.org
Tue May 10 14:42:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch reproducible
in repository cdbs.
commit 97f577974f882bdca7aa013e3345305682aba1b0
Author: Jonas Smedegaard <dr at jones.dk>
Date: Wed Apr 9 01:49:06 2014 +0200
Tidy snippets: wrap+strip wide lines, and strip trailing whitespace.
---
1/class/ant-vars.mk.in | 57 +++++++++----
1/class/ant.mk.in | 15 +++-
1/class/autotools-files.mk.in | 35 ++++++--
1/class/autotools-vars.mk.in | 106 ++++++++++++++++++------
1/class/autotools.mk.in | 34 ++++++--
1/class/cmake.mk.in | 22 ++++-
1/class/gnome.mk.in | 27 ++++--
1/class/hbuild.mk.in | 8 +-
1/class/kde.mk.in | 18 +++-
1/class/makefile-vars.mk.in | 21 +++--
1/class/makefile.mk.in | 85 +++++++++++++++----
1/class/pd.mk.in | 14 +++-
1/class/perl-build.mk.in | 48 ++++++++---
1/class/perl-makemaker.mk.in | 7 +-
1/class/perl-vars.mk.in | 8 +-
1/class/perlmodule.mk.in | 3 +-
1/class/python-autotools.mk.in | 8 +-
1/class/python-distutils.mk.in | 34 +++++---
1/class/python-module.mk.in | 49 ++++++++---
1/class/python-sugar.mk.in | 54 ++++++++----
1/class/python-vars.mk.in | 181 ++++++++++++++++++++++++++++++++---------
1/class/qmake.mk.in | 15 +++-
1/class/scons.mk.in | 27 ++++--
1/class/waf.mk.in | 15 +++-
1/rules/buildcore.mk.in | 143 ++++++++++++++++++++++++--------
1/rules/debhelper.mk.in | 141 +++++++++++++++++++++++---------
1/rules/dpatch.mk.in | 4 +-
1/rules/simple-patchsys.mk.in | 4 +-
1/rules/upstream-tarball.mk.in | 4 +-
29 files changed, 894 insertions(+), 293 deletions(-)
diff --git a/1/class/ant-vars.mk.in b/1/class/ant-vars.mk.in
index 43f2bb1..ce71086 100644
--- a/1/class/ant-vars.mk.in
+++ b/1/class/ant-vars.mk.in
@@ -29,8 +29,12 @@ ANT_HOME ?= /usr/share/ant
# JAVA_HOME_DIRS to multiple possible home directories. The first existing
# directory from this list is used for JAVA_HOME. You can also override
# JAVACMD in case you don't want to use the default JAVA_HOME/bin/java.
-JAVA_HOME ?= $(shell for jh in $(JAVA_HOME_DIRS); do if [ -x "$$jh/bin/java" ]; then \
- echo $${jh}; exit 0; fi; done)
+JAVA_HOME ?= $(shell \
+ for jh in $(JAVA_HOME_DIRS); do \
+ if [ -x "$$jh/bin/java" ]; then \
+ echo $${jh}; exit 0; \
+ fi; \
+ done)
JAVACMD ?= $(JAVA_HOME)/bin/java
# You can list all Java ARchives (JARs) to be added to the class path in
@@ -40,13 +44,24 @@ JAVACMD ?= $(JAVA_HOME)/bin/java
# end of the class path if it exists in the JDK's lib directory.
# You can override the complete class path using DEB_CLASSPATH.
DEB_JARS_BASE ?= /usr/share/java
-DEB_CLASSPATH ?= $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(shell for jar in $(DEB_JARS); do \
- if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
- if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
- done; \
- if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
+DEB_CLASSPATH ?= $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(shell \
+ for jar in $(DEB_JARS); do \
+ if [ -f "$$jar" ]; then \
+ echo -n "$${jar}:"; \
+ fi; \
+ if [ -f "$$jar".jar ]; then \
+ echo -n "$${jar}.jar:"; \
+ fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then \
+ echo -n "$(DEB_JARS_BASE)/$${jar}:"; \
+ fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then \
+ echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; \
+ fi; \
+ done; \
+ if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then \
+ echo -n "$(JAVA_HOME)/lib/tools.jar"; \
+ fi)
# Set compile.debug and compile.optimize depending on DEB_BUILD_OPTIONS to
# match the behaviour of C/C++ programs
@@ -62,20 +77,28 @@ endif
# you don't have to modify upstream's build.xml. Please note that command-line
# arguments in ANT_ARGS (see below) override the settings in build.xml and
# the property file.
-DEB_ANT_PROPERTYFILE ?= $(shell test -f $(CURDIR)/debian/ant.properties && echo $(CURDIR)/debian/ant.properties)
+DEB_ANT_PROPERTYFILE ?= $(shell \
+ test -f $(CURDIR)/debian/ant.properties && echo $(CURDIR)/debian/ant.properties)
# You can specify additional JVM arguments in ANT_OPTS and Ant command-line
# arguments in ANT_ARGS, like for the Ant wrapper script and sepcified in
# Ant's documentation ("Running Ant"). You can additionally define
# ANT_ARGS_<package> for each individual package, e.g. to override the default
# settings for compile.optimize.
-DEB_ANT_INVOKE ?= cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \
- $(ANT_OPTS) -Dant.home=$(ANT_HOME) \
- org.apache.tools.ant.Main $(DEB_ANT_ARGS) \
- $(if $(ANT_ARGS_$(cdbs_curpkg)),$(ANT_ARGS_$(cdbs_curpkg)),$(ANT_ARGS)) \
- $(if $(DEB_ANT_COMPILER),-Dbuild.compiler=$(DEB_ANT_COMPILER),) \
- $(if $(DEB_ANT_BUILDFILE),-buildfile $(DEB_ANT_BUILDFILE),) \
- $(if $(DEB_ANT_PROPERTYFILE),-propertyfile $(DEB_ANT_PROPERTYFILE),)
+DEB_ANT_INVOKE ?= set -e; \
+ cd $(DEB_BUILDDIR); \
+ $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ $(ANT_OPTS) -Dant.home=$(ANT_HOME) \
+ org.apache.tools.ant.Main $(DEB_ANT_ARGS) \
+ $(if $(ANT_ARGS_$(cdbs_curpkg)),\
+ $(ANT_ARGS_$(cdbs_curpkg)),\
+ $(ANT_ARGS)) \
+ $(if $(DEB_ANT_COMPILER),\
+ -Dbuild.compiler=$(DEB_ANT_COMPILER)) \
+ $(if $(DEB_ANT_BUILDFILE),\
+ -buildfile $(DEB_ANT_BUILDFILE)) \
+ $(if $(DEB_ANT_PROPERTYFILE),\
+ -propertyfile $(DEB_ANT_PROPERTYFILE))
# Targets to invoke for building, installing, testing and cleaning up.
# Building uses the default target from build.xml, installing and testing is
diff --git a/1/class/ant.mk.in b/1/class/ant.mk.in
index ffb29db..a61db78 100644
--- a/1/class/ant.mk.in
+++ b/1/class/ant.mk.in
@@ -44,16 +44,23 @@ clean::
common-install-arch common-install-indep:: common-install-impl
common-install-impl::
- $(if $(DEB_ANT_INSTALL_TARGET),$(DEB_ANT_INVOKE) $(DEB_ANT_INSTALL_TARGET), at echo "DEB_ANT_INSTALL_TARGET unset, skipping default ant.mk common-install target")
+ $(if $(DEB_ANT_INSTALL_TARGET),\
+ $(DEB_ANT_INVOKE) $(DEB_ANT_INSTALL_TARGET),\
+ @echo "DEB_ANT_INSTALL_TARGET unset, \
+ skipping default ant.mk common-install target")
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
common-build-arch common-build-indep:: debian/stamp-ant-check
debian/stamp-ant-check: debian/stamp-ant-build
- $(if $(DEB_ANT_CHECK_TARGET),$(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET), at echo "DEB_ANT_CHECK_TARGET unset, not running checks")
- $(if $(DEB_ANT_CHECK_TARGET),touch $@)
+ $(if $(DEB_ANT_CHECK_TARGET),\
+ $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET),\
+ @echo "DEB_ANT_CHECK_TARGET unset, not running checks")
+ $(if $(DEB_ANT_CHECK_TARGET),\
+ touch $@)
clean::
- $(if $(DEB_ANT_CHECK_TARGET),rm -f debian/stamp-ant-check)
+ $(if $(DEB_ANT_CHECK_TARGET),\
+ rm -f debian/stamp-ant-check)
endif
endif
diff --git a/1/class/autotools-files.mk.in b/1/class/autotools-files.mk.in
index 8414f09..47e0ea2 100644
--- a/1/class/autotools-files.mk.in
+++ b/1/class/autotools-files.mk.in
@@ -57,11 +57,36 @@ cdbs_autotools_invoke=$(if $(findstring $(comma),$(1)),$(3),$(2)$(1))
common-configure-arch common-configure-indep:: debian/stamp-autotools-files
debian/stamp-autotools-files:
- $(if $(filter pre,$(DEB_AUTO_UPDATE_LIBTOOL)),cd $(DEB_SRCDIR) && libtoolize -c -f)
- $(if $(DEB_AUTO_UPDATE_ACLOCAL),cd $(DEB_SRCDIR) && $(call cdbs_autotools_invoke,$(DEB_AUTO_UPDATE_ACLOCAL),aclocal-,aclocal) $(DEB_ACLOCAL_ARGS))
- $(if $(DEB_AUTO_UPDATE_AUTOCONF),if [ -e $(DEB_SRCDIR)/configure.ac ] || [ -e $(DEB_SRCDIR)/configure.in ]; then cd $(DEB_SRCDIR) && `which $(call cdbs_autotools_invoke,$(DEB_AUTO_UPDATE_AUTOCONF),autoconf,autoconf) || which autoconf`; fi)
- $(if $(DEB_AUTO_UPDATE_AUTOHEADER),if [ -e $(DEB_SRCDIR)/configure.ac ] || [ -e $(DEB_SRCDIR)/configure.in ]; then cd $(DEB_SRCDIR) && `which $(call cdbs_autotools_invoke,$(DEB_AUTO_UPDATE_AUTOHEADER),autoheader,autoheader) || which autoheader` ; fi)
- $(if $(DEB_AUTO_UPDATE_AUTOMAKE),if [ -e $(DEB_SRCDIR)/Makefile.am ]; then cd $(DEB_SRCDIR) && $(call cdbs_autotools_invoke,$(DEB_AUTO_UPDATE_AUTOMAKE),automake-,automake) $(DEB_AUTOMAKE_ARGS) ; fi)
+ $(if $(filter pre,$(DEB_AUTO_UPDATE_LIBTOOL)),\
+ set -e; \
+ cd $(DEB_SRCDIR); \
+ libtoolize -c -f)
+ $(if $(DEB_AUTO_UPDATE_ACLOCAL),\
+ set -e; \
+ cd $(DEB_SRCDIR); \
+ $(call cdbs_autotools_invoke,$(DEB_AUTO_UPDATE_ACLOCAL),aclocal-,aclocal) \
+ $(DEB_ACLOCAL_ARGS))
+ $(if $(DEB_AUTO_UPDATE_AUTOCONF),\
+ set -e; \
+ if [ -e $(DEB_SRCDIR)/configure.ac ] || [ -e $(DEB_SRCDIR)/configure.in ]; then \
+ cd $(DEB_SRCDIR); \
+ `which $(call cdbs_autotools_invoke,$(DEB_AUTO_UPDATE_AUTOCONF),autoconf,autoconf) \
+ || which autoconf`; \
+ fi)
+ $(if $(DEB_AUTO_UPDATE_AUTOHEADER),\
+ set -e; \
+ if [ -e $(DEB_SRCDIR)/configure.ac ] || [ -e $(DEB_SRCDIR)/configure.in ]; then \
+ cd $(DEB_SRCDIR); \
+ `which $(call cdbs_autotools_invoke,$(DEB_AUTO_UPDATE_AUTOHEADER),autoheader,autoheader) \
+ || which autoheader`; \
+ fi)
+ $(if $(DEB_AUTO_UPDATE_AUTOMAKE),\
+ set -e; \
+ if [ -e $(DEB_SRCDIR)/Makefile.am ]; then \
+ cd $(DEB_SRCDIR); \
+ $(call cdbs_autotools_invoke,$(DEB_AUTO_UPDATE_AUTOMAKE),automake-,automake) \
+ $(DEB_AUTOMAKE_ARGS); \
+ fi)
touch debian/stamp-autotools-files
clean::
diff --git a/1/class/autotools-vars.mk.in b/1/class/autotools-vars.mk.in
index 13fff0b..361b9fc 100644
--- a/1/class/autotools-vars.mk.in
+++ b/1/class/autotools-vars.mk.in
@@ -34,7 +34,12 @@ DEB_AC_AUX_DIR ?= $(DEB_SRCDIR)
# Declare CC and CXX only if explicitly set in environment or makefile
# (i.e. skip if builtin make default would have been used)
# This is needed for proper cross-compilation - see bug#450483)
-DEB_CONFIGURE_SCRIPT_ENV ?= $(call cdbs_set_nondefaultvars,CC CXX) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+DEB_CONFIGURE_SCRIPT_ENV ?= \
+ $(call cdbs_set_nondefaultvars,CC CXX) \
+ CFLAGS="$(CFLAGS)" \
+ CXXFLAGS="$(CXXFLAGS)" \
+ CPPFLAGS="$(CPPFLAGS)" \
+ LDFLAGS="$(LDFLAGS)"
DEB_CONFIGURE_SCRIPT ?= $(CURDIR)/$(DEB_SRCDIR)/configure
@@ -42,7 +47,9 @@ DEB_CONFIGURE_SCRIPT ?= $(CURDIR)/$(DEB_SRCDIR)/configure
# compiling with autotools 2.52+ without slowing down normal builds.
# Cross-compiling with autotools 2.13 is unsupported, as it needs
# other tweaks (more info at autotools-dev README.Debian)
-DEB_CONFIGURE_CROSSBUILD_ARGS ?= --build=$(DEB_BUILD_GNU_TYPE) $(if $(cdbs_crossbuild),--host=$(DEB_HOST_GNU_TYPE))
+DEB_CONFIGURE_CROSSBUILD_ARGS ?= \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ $(if $(cdbs_crossbuild),--host=$(DEB_HOST_GNU_TYPE))
DEB_CONFIGURE_PREFIX ?=/usr
DEB_CONFIGURE_INCLUDEDIR ?= "\$${prefix}/include"
@@ -54,60 +61,105 @@ DEB_CONFIGURE_LIBEXECDIR ?= "\$${prefix}/lib/$(DEB_SOURCE_PACKAGE)"
# --srcdir=. is required because otherwise configure wants to analyse
# $0 to see whether a VPATH build is needed. This tells it with
# absolute certainly that this is NOT a VPATH build.
-DEB_CONFIGURE_PATH_ARGS ?= --prefix=$(DEB_CONFIGURE_PREFIX) --includedir=$(DEB_CONFIGURE_INCLUDEDIR) --mandir=$(DEB_CONFIGURE_MANDIR) --infodir=$(DEB_CONFIGURE_INFODIR) --sysconfdir=$(DEB_CONFIGURE_SYSCONFDIR) --localstatedir=$(DEB_CONFIGURE_LOCALSTATEDIR) --libexecdir=$(DEB_CONFIGURE_LIBEXECDIR) $(if $(subst $(DEB_SRCDIR),,$(cdbs_make_curbuilddir)),,--srcdir=.)
-
-DEB_CONFIGURE_NORMAL_ARGS ?= $(DEB_CONFIGURE_CROSSBUILD_ARGS) $(DEB_CONFIGURE_PATH_ARGS) --disable-maintainer-mode --disable-dependency-tracking --disable-silent-rules
+DEB_CONFIGURE_PATH_ARGS ?= \
+ --prefix=$(DEB_CONFIGURE_PREFIX) \
+ --includedir=$(DEB_CONFIGURE_INCLUDEDIR) \
+ --mandir=$(DEB_CONFIGURE_MANDIR) \
+ --infodir=$(DEB_CONFIGURE_INFODIR) \
+ --sysconfdir=$(DEB_CONFIGURE_SYSCONFDIR) \
+ --localstatedir=$(DEB_CONFIGURE_LOCALSTATEDIR) \
+ --libexecdir=$(DEB_CONFIGURE_LIBEXECDIR) \
+ $(if $(subst $(DEB_SRCDIR),,$(cdbs_make_curbuilddir)),,--srcdir=.)
+
+DEB_CONFIGURE_NORMAL_ARGS ?= \
+ $(DEB_CONFIGURE_CROSSBUILD_ARGS) \
+ $(DEB_CONFIGURE_PATH_ARGS) \
+ --disable-maintainer-mode \
+ --disable-dependency-tracking \
+ --disable-silent-rules
ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
DEB_CONFIGURE_DEBUG_ARGS ?= --enable-debug
endif
-DEB_CONFIGURE_INVOKE ?= cd $(cdbs_make_curbuilddir) && $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_DEBUG_ARGS)
+DEB_CONFIGURE_INVOKE ?= cd $(cdbs_make_curbuilddir) && \
+ $(DEB_CONFIGURE_SCRIPT_ENV) \
+ $(DEB_CONFIGURE_SCRIPT) \
+ $(DEB_CONFIGURE_NORMAL_ARGS) \
+ $(DEB_CONFIGURE_DEBUG_ARGS)
#DEB_CONFIGURE_EXTRA_FLAGS =
## calculate dependencies for an autotools package
-# call as: $(call cdbs_autotools_dependencies,$(VERSION),$(VERSIONEDPACKAGE),$(PACKAGE))
+# call as: $(call cdbs_autotools_dependencies,$(VERSION),$(VERSIONEDPKG),$(PKG))
# if VERSION is a single value,
-# it returns $(VERSIONEDPACKAGE)$(VERSION)
+# it returns $(VERSIONEDPKG)$(VERSION)
# if VERSION is a comma-separated pair,
-# it returns "$(PACKAGE) (>=$(VERSION[0])),$(PACKAGE) (<=$(VERSION[1]))"
+# it returns "$(PKG) (>=$(VERSION[0])),$(PKG) (<=$(VERSION[1]))"
# one value of the pair can be omitted to not specify a min/max version
-# if both values of the pair are omitted (',') an unversioned dependency on PACKAGE is created
+# if both values of the pair are omitted (',') an unversioned dependency
+# on PKG is created
#
-# example, with PACKAGE=foo, VERSIONEDPACKAGE=foob- and VERSION=...
+# example, with PKG=foo, VERSIONEDPKG=foob- and VERSION=...
# 3 : foob-3
# 4,7 : foo (>=4), foo (<=7)
# 1.10, : foo (>=1.10)
# ,3.14 : foo (<=3.14)
# , : foo
-cdbs_autotools_dependencies=$(if $(findstring $(comma),$(1)), \
- $(or \
- $(and $(filter $(1),$(comma)),$(3)),\
- $(and $(filter-out $(1),$(patsubst %$(comma),%,$(1))),$(3) (>=$(patsubst %$(comma),%,$(1)))),\
- $(and $(filter-out $(1),$(patsubst $(comma)%,%,$(1))),$(3) (<=$(patsubst $(comma)%,%,$(1)))),\
- $(3) (>=$(firstword $(subst $(comma), ,$(1))))$(comma) $(3) (<=$(lastword $(subst $(comma), ,$(1))))),\
+cdbs_autotools_dependencies = $(if $(findstring $(comma),$(1)),\
+ $(or $(strip \
+ $(and $(filter $(1),$(comma)),\
+ $(3))),$(strip \
+ $(and $(filter-out $(1),$(patsubst %$(comma),%,$(1))),\
+ $(3) (>=$(patsubst %$(comma),%,$(1))))),$(strip \
+ $(and $(filter-out $(1),$(patsubst $(comma)%,%,$(1))),\
+ $(3) (<=$(patsubst $(comma)%,%,$(1))))),$(strip \
+ $(3) (>=$(firstword $(subst $(comma), ,$(1))))$(comma) \
+ $(3) (<=$(lastword $(subst $(comma), ,$(1)))))),\
$(2)$(1))
CDBS_BUILD_DEPENDS_class_autotools-vars_libtool ?= libtool
-CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_LIBTOOL),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_libtool))
+CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_LIBTOOL),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_libtool))
-CDBS_BUILD_DEPENDS_class_autotools-vars_automake ?= $(call cdbs_autotools_dependencies,$(DEB_AUTO_UPDATE_AUTOMAKE),automake,automake)
-CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_AUTOMAKE),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_automake))
+CDBS_BUILD_DEPENDS_class_autotools-vars_automake ?= \
+ $(call cdbs_autotools_dependencies,\
+ $(DEB_AUTO_UPDATE_AUTOMAKE),automake,automake)
+CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_AUTOMAKE),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_automake))
-CDBS_BUILD_DEPENDS_class_autotools-vars_aclocal ?= $(call cdbs_autotools_dependencies,$(DEB_AUTO_UPDATE_ACLOCAL),automake,automake)
-CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_ACLOCAL),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_aclocal))
+CDBS_BUILD_DEPENDS_class_autotools-vars_aclocal ?= \
+ $(call cdbs_autotools_dependencies,\
+ $(DEB_AUTO_UPDATE_ACLOCAL),automake,automake)
+CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_ACLOCAL),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_aclocal))
CDBS_BUILD_DEPENDS_class_autotools-vars_autoconf ?= \
- $(if $(findstring $(comma),$(DEB_AUTO_UPDATE_AUTOCONF)),$(call cdbs_autotools_dependencies,$(DEB_AUTO_UPDATE_AUTOCONF),autoconf,autoconf),autoconf$(filter 2.13,$(DEB_AUTO_UPDATE_AUTOCONF)))
-CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_AUTOCONF),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_autoconf))
+ $(if $(findstring $(comma),$(DEB_AUTO_UPDATE_AUTOCONF)),\
+ $(call cdbs_autotools_dependencies,\
+ $(DEB_AUTO_UPDATE_AUTOCONF),autoconf,autoconf),\
+ autoconf$(filter 2.13,$(DEB_AUTO_UPDATE_AUTOCONF)))
+CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_AUTOCONF),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_autoconf))
CDBS_BUILD_DEPENDS_class_autotools-vars_autoheader ?= \
- $(if $(findstring $(comma),$(DEB_AUTO_UPDATE_AUTOHEADER)),$(call cdbs_autotools_dependencies,$(DEB_AUTO_UPDATE_AUTOHEADER),autoconf,autoconf),autoconf$(filter 2.13,$(DEB_AUTO_UPDATE_AUTOHEADER)))
-CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_AUTOHEADER),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_autoheader))
+ $(if $(findstring $(comma),$(DEB_AUTO_UPDATE_AUTOHEADER)),\
+ $(call cdbs_autotools_dependencies,\
+ $(DEB_AUTO_UPDATE_AUTOHEADER),autoconf,autoconf),\
+ autoconf$(filter 2.13,$(DEB_AUTO_UPDATE_AUTOHEADER)))
+CDBS_BUILD_DEPENDS += $(if $(DEB_AUTO_UPDATE_AUTOHEADER),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_autotools-vars_autoheader))
CDBS_BUILD_DEPENDS_class_autotools_vars_comma ?= cdbs (>= 0.4.123~)
-CDBS_BUILD_DEPENDS += $(if $(findstring $(comma),$(foreach suffix,LIBTOOL AUTOMAKE ACLOCAL AUTOCONF AUTOHEADER,$(DEB_AUTO_UPDATE_$(suffix)))),$(comma) $(CDBS_BUILD_DEPENDS_class_autotools_vars_comma))
+CDBS_BUILD_DEPENDS += $(if \
+ $(findstring $(comma),$(foreach suffix,\
+ LIBTOOL \
+ AUTOMAKE \
+ ACLOCAL \
+ AUTOCONF \
+ AUTOHEADER,\
+ $(DEB_AUTO_UPDATE_$(suffix)))),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_autotools_vars_comma))
endif
diff --git a/1/class/autotools.mk.in b/1/class/autotools.mk.in
index 5de6133..635e5c1 100644
--- a/1/class/autotools.mk.in
+++ b/1/class/autotools.mk.in
@@ -23,8 +23,11 @@ _cdbs_class_autotools = 1
include $(_cdbs_class_path)/autotools-files.mk$(_cdbs_makefile_suffix)
-cdbs_autotools_configure_stamps = $(if $(cdbs_make_flavors),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-autotools/%,$(cdbs_make_flavors)),debian/stamp-autotools)
-cdbs_configure_flags += $(if $(cdbs_make_flavors),$(DEB_CONFIGURE_FLAGS_$(cdbs_make_curflavor)),)
+cdbs_autotools_configure_stamps = $(if $(cdbs_make_flavors),\
+ $(cdbs_make_builddir_check)$(patsubst %,debian/stamp-autotools/%,$(cdbs_make_flavors)),\
+ debian/stamp-autotools)
+cdbs_configure_flags += $(if $(cdbs_make_flavors),\
+ $(DEB_CONFIGURE_FLAGS_$(cdbs_make_curflavor)))
# Overriden from makefile-vars.mk. We pass CFLAGS and friends to
# ./configure, so no need to pass them to make.
@@ -38,15 +41,30 @@ common-configure-arch common-configure-indep:: common-configure-impl
common-configure-impl:: $(cdbs_autotools_configure_stamps)
$(cdbs_autotools_configure_stamps):
chmod a+x $(DEB_CONFIGURE_SCRIPT)
- $(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),,mkdir -p $(cdbs_make_curbuilddir))
- $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS)
- $(if $(filter post,$(DEB_AUTO_UPDATE_LIBTOOL)),if [ -e $(cdbs_make_curbuilddir)/libtool ]; then cp -f /usr/bin/libtool $(cdbs_make_curbuilddir)/libtool; fi)
+ $(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),\
+ ,\
+ mkdir -p $(cdbs_make_curbuilddir))
+ $(DEB_CONFIGURE_INVOKE) \
+ $(cdbs_configure_flags) \
+ $(DEB_CONFIGURE_EXTRA_FLAGS) \
+ $(DEB_CONFIGURE_USER_FLAGS)
+ $(if $(filter post,$(DEB_AUTO_UPDATE_LIBTOOL)),\
+ if [ -e $(cdbs_make_curbuilddir)/libtool ]; then \
+ cp -f /usr/bin/libtool $(cdbs_make_curbuilddir)/libtool; \
+ fi)
touch $@
makefile-clean::
- $(if $(cdbs_make_flavors),-rmdir --ignore-fail-on-non-empty debian/stamp-autotools,rm -f debian/stamp-autotools)
+ $(if $(cdbs_make_flavors),\
+ -rmdir --ignore-fail-on-non-empty \
+ debian/stamp-autotools,\
+ rm -f debian/stamp-autotools)
$(cdbs_make_clean_nonstamps)::
- $(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),,-rmdir --ignore-fail-on-non-empty $(cdbs_make_curbuilddir))
- $(if $(cdbs_make_flavors),rm -f $(@:makefile-clean%=debian/stamp-autotools%))
+ $(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),\
+ ,\
+ -rmdir --ignore-fail-on-non-empty \
+ $(cdbs_make_curbuilddir))
+ $(if $(cdbs_make_flavors),\
+ rm -f $(@:makefile-clean%=debian/stamp-autotools%))
endif
diff --git a/1/class/cmake.mk.in b/1/class/cmake.mk.in
index bc5d6f7..4813a5b 100644
--- a/1/class/cmake.mk.in
+++ b/1/class/cmake.mk.in
@@ -45,14 +45,30 @@ DEB_CMAKE_INSTALL_PREFIX ?= /usr
DEB_CMAKE_CFLAGS ?= $(CFLAGS) $(CPPFLAGS)
DEB_CMAKE_CXXFLAGS ?= $(CXXFLAGS) $(CPPFLAGS)
DEB_CMAKE_LDFLAGS ?= $(LDFLAGS)
-DEB_CMAKE_NORMAL_ARGS ?= -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" -DCMAKE_C_COMPILER:FILEPATH="$(CC)" -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" -DCMAKE_C_FLAGS="$(DEB_CMAKE_CFLAGS)" -DCMAKE_CXX_FLAGS="$(DEB_CMAKE_CXXFLAGS)" -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXE_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)"
+DEB_CMAKE_NORMAL_ARGS ?= \
+ -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
+ -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
+ -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
+ -DCMAKE_C_FLAGS="$(DEB_CMAKE_CFLAGS)" \
+ -DCMAKE_CXX_FLAGS="$(DEB_CMAKE_CXXFLAGS)" \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_EXE_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" \
+ -DCMAKE_MODULE_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)" \
+ -DCMAKE_SHARED_LINKER_FLAGS="$(DEB_CMAKE_LDFLAGS)"
common-configure-arch common-configure-indep:: common-configure-impl
common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt
$(DEB_BUILDDIR)/CMakeCache.txt:
- cd $(DEB_BUILDDIR) && $(CMAKE) $(CURDIR)/$(DEB_SRCDIR) $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS)
+ set -e; \
+ cd $(DEB_BUILDDIR); \
+ $(CMAKE) $(CURDIR)/$(DEB_SRCDIR) \
+ $(DEB_CMAKE_NORMAL_ARGS) \
+ $(DEB_CMAKE_EXTRA_FLAGS)
cleanbuilddir::
- -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),\
+ ,\
+ rm -rf $(DEB_BUILDDIR))
endif
diff --git a/1/class/gnome.mk.in b/1/class/gnome.mk.in
index c9bb2fd..adbea3d 100644
--- a/1/class/gnome.mk.in
+++ b/1/class/gnome.mk.in
@@ -32,15 +32,30 @@ CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_gnome)
# Most GNOME upstreams don't bother to fix this.
clean::
- cd $(DEB_BUILDDIR) && \
- rm -f intltool-extract intltool-merge intltool-update po/.intltool-merge-cache; \
- if test -d doc; then find doc -name '*.omf.out' -exec rm -f \{\} \; ; fi; \
- if test -d help; then find help -name '*.omf.out' -exec rm -f \{\} \; ; fi
+ set -e; \
+ cd $(DEB_BUILDDIR); \
+ rm -f \
+ intltool-extract \
+ intltool-merge \
+ intltool-update \
+ po/.intltool-merge-cache; \
+ if test -d doc; then \
+ find doc -name '*.omf.out' \
+ -exec rm -f \{\} \; ; \
+ fi; \
+ if test -d help; then \
+ find help -name '*.omf.out' \
+ -exec rm -f \{\} \; ; \
+ fi
# debhelper.mk targets, so silently ignored if debhelper.mk not included
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- $(if $(wildcard /usr/bin/dh_gconf),dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS))
- $(if $(wildcard /usr/bin/dh_icons),dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONS_ARGS))
+ $(if $(wildcard /usr/bin/dh_gconf),\
+ dh_gconf -p$(cdbs_curpkg) \
+ $(DEB_DH_GCONF_ARGS))
+ $(if $(wildcard /usr/bin/dh_icons),\
+ dh_icons -p$(cdbs_curpkg) \
+ $(DEB_DH_ICONS_ARGS))
# Use xz compression.
DEB_DH_BUILDDEB_ARGS ?= -u-Zxz
diff --git a/1/class/hbuild.mk.in b/1/class/hbuild.mk.in
index dd2ca81..3974a7b 100644
--- a/1/class/hbuild.mk.in
+++ b/1/class/hbuild.mk.in
@@ -27,9 +27,13 @@ include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
cdbs_hugs_packages = $(filter %-hugs,$(DEB_PACKAGES))
cdbs_ghc_packages = $(filter %-ghc,$(DEB_PACKAGES))
-DEB_HBUILD_SETUPFILE ?= $(firstword $(wildcard $(DEB_SRCDIR)/Setup.lhs $(DEB_SRCDIR)/Setup.hs))
+DEB_HBUILD_SETUPFILE ?= $(firstword \
+ $(wildcard $(DEB_SRCDIR)/Setup.lhs $(DEB_SRCDIR)/Setup.hs))
-DEB_HBUILD_INVOKE ?= $(DEB_HBUILD_SETUPFILE) --noreg --runfrom="" --prefix=debian/$(cdbs_curpkg)
+DEB_HBUILD_INVOKE ?= $(DEB_HBUILD_SETUPFILE) \
+ --noreg \
+ --runfrom="" \
+ --prefix=debian/$(cdbs_curpkg)
clean::
$(DEB_HBUILD_SETUPFILE) allclean
diff --git a/1/class/kde.mk.in b/1/class/kde.mk.in
index c47a470..b98bff3 100644
--- a/1/class/kde.mk.in
+++ b/1/class/kde.mk.in
@@ -52,7 +52,12 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
-cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
# FIXME: Restructure to allow early override
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
@@ -60,16 +65,21 @@ DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
cleanbuilddir::
- -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+ $(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),\
+ ,\
+ -rm -rf $(DEB_BUILDDIR))
common-build-arch common-build-indep:: debian/stamp-kde-apidox
debian/stamp-kde-apidox:
- $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ $(if $(DEB_KDE_APIDOX),\
+ +$(DEB_MAKE_INVOKE) apidox)
touch $@
common-install-arch common-install-indep:: common-install-kde-apidox
common-install-kde-apidox::
- $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+ $(if $(DEB_KDE_APIDOX),\
+ +$(DEB_MAKE_INVOKE) install-apidox \
+ DESTDIR=$(DEB_DESTDIR))
clean::
rm -f debian/stamp-kde-apidox
diff --git a/1/class/makefile-vars.mk.in b/1/class/makefile-vars.mk.in
index 636f291..6b6d869 100644
--- a/1/class/makefile-vars.mk.in
+++ b/1/class/makefile-vars.mk.in
@@ -24,14 +24,25 @@ _cdbs_class_makefile_vars = 1
include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
#DEB_MAKE_MAKEFILE =
-DEB_MAKE_ENVVARS ?= $(if $(cdbs_crossbuild),CC="$(DEB_HOST_GNU_TYPE)-gcc")
-DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS))
+DEB_MAKE_ENVVARS ?= $(if $(cdbs_crossbuild),\
+ CC="$(DEB_HOST_GNU_TYPE)-gcc")
+DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),\
+ -j$(DEB_PARALLEL_JOBS))
-# Derived classes that supply the flags some other way (e.g., configure)
+# Derived classes that supply the flags some other way (e.g., configure)
# should set this variable to empty.
-DEB_MAKE_EXTRA_ARGS ?= CFLAGS="$(or $(CFLAGS_$(cdbs_curpkg)),$(CFLAGS))" CXXFLAGS="$(or $(CXXFLAGS_$(cdbs_curpkg)),$(CXXFLAGS))" CPPFLAGS="$(or $(CPPFLAGS_$(cdbs_curpkg)),$(CPPFLAGS))" LDFLAGS="$(or $(LDFLAGS_$(cdbs_curpkg)),$(LDFLAGS))" $(DEB_MAKE_PARALLEL)
+DEB_MAKE_EXTRA_ARGS ?= \
+ CFLAGS="$(or $(CFLAGS_$(cdbs_curpkg)),$(CFLAGS))" \
+ CXXFLAGS="$(or $(CXXFLAGS_$(cdbs_curpkg)),$(CXXFLAGS))" \
+ CPPFLAGS="$(or $(CPPFLAGS_$(cdbs_curpkg)),$(CPPFLAGS))" \
+ LDFLAGS="$(or $(LDFLAGS_$(cdbs_curpkg)),$(LDFLAGS))" \
+ $(DEB_MAKE_PARALLEL)
-DEB_MAKE_INVOKE ?= $(DEB_MAKE_ENVVARS) $(MAKE) $(if $(DEB_MAKE_MAKEFILE), -f $(DEB_MAKE_MAKEFILE),) -C $(or $(cdbs_make_curbuilddir),$(cdbs_curbuilddir)) $(DEB_MAKE_EXTRA_ARGS)
+DEB_MAKE_INVOKE ?= $(DEB_MAKE_ENVVARS) $(MAKE) \
+ $(if $(DEB_MAKE_MAKEFILE),\
+ -f $(DEB_MAKE_MAKEFILE)) \
+ -C $(or $(cdbs_make_curbuilddir),$(cdbs_curbuilddir)) \
+ $(DEB_MAKE_EXTRA_ARGS)
#DEB_MAKE_BUILD_TARGET =
diff --git a/1/class/makefile.mk.in b/1/class/makefile.mk.in
index 8a6ff8f..9575657 100644
--- a/1/class/makefile.mk.in
+++ b/1/class/makefile.mk.in
@@ -25,20 +25,46 @@ include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
include $(_cdbs_class_path)/makefile-vars.mk$(_cdbs_makefile_suffix)
cdbs_make_flavors = $(sort $(DEB_MAKE_FLAVORS))
-cdbs_make_builddir_check = $(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),$(error DEB_MAKE_FLAVORS in use: DEB_BUILDDIR must be different from DEB_SRCDIR, and needs to be declared before including makefile.mk))
-cdbs_make_build_stamps = $(if $(cdbs_make_flavors),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-build/%,$(cdbs_make_flavors)),debian/stamp-makefile-build)
-cdbs_make_install_stamps = $(if $(cdbs_make_flavors),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-install/%,$(cdbs_make_flavors)),debian/stamp-makefile-install)
-cdbs_make_check_stamps = $(if $(cdbs_make_flavors),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-check/%,$(cdbs_make_flavors)),debian/stamp-makefile-check)
-cdbs_make_clean_nonstamps = $(if $(cdbs_make_flavors),$(patsubst %,makefile-clean/%,$(cdbs_make_flavors)),makefile-clean)
+cdbs_make_builddir_check = $(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),\
+ $(error DEB_MAKE_FLAVORS in use: \
+ DEB_BUILDDIR must be different from DEB_SRCDIR, \
+ and needs to be declared before including makefile.mk))
+cdbs_make_build_stamps = $(strip $(if $(cdbs_make_flavors),\
+ $(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-build/%,\
+ $(cdbs_make_flavors)),\
+ debian/stamp-makefile-build))
+cdbs_make_install_stamps = $(strip $(if $(cdbs_make_flavors),\
+ $(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-install/%,\
+ $(cdbs_make_flavors)),\
+ debian/stamp-makefile-install))
+cdbs_make_check_stamps = $(strip $(if $(cdbs_make_flavors),\
+ $(cdbs_make_builddir_check)$(patsubst %,debian/stamp-makefile-check/%,\
+ $(cdbs_make_flavors)),\
+ debian/stamp-makefile-check))
+cdbs_make_clean_nonstamps = $(if $(cdbs_make_flavors),\
+ $(patsubst %,makefile-clean/%,$(cdbs_make_flavors)),\
+ makefile-clean)
cdbs_make_curflavor = $(filter-out %/,$(subst /,/ ,$@))
-cdbs_make_curbuilddir = $(if $(cdbs_make_flavors),$(subst @FLAVOR@,$(cdbs_make_curflavor),$(or $(DEB_MAKE_BUILDDIRSKEL_$(cdbs_make_curflavor)),$(DEB_MAKE_BUILDDIRSKEL))),$(cdbs_curbuilddir))
-cdbs_make_curdestdir = $(if $(cdbs_make_flavors),$(subst @FLAVOR@,$(cdbs_make_curflavor),$(or $(DEB_MAKE_DESTDIRSKEL_$(cdbs_make_curflavor)),$(DEB_MAKE_DESTDIRSKEL))),$(cdbs_curdestdir))
+cdbs_make_curbuilddir = $(strip $(if $(cdbs_make_flavors),\
+ $(subst @FLAVOR@,$(cdbs_make_curflavor),$(or $(strip \
+ $(DEB_MAKE_BUILDDIRSKEL_$(cdbs_make_curflavor))),$(strip \
+ $(DEB_MAKE_BUILDDIRSKEL)))),\
+ $(cdbs_curbuilddir)))
+cdbs_make_curdestdir = $(strip $(if $(cdbs_make_flavors),\
+ $(subst @FLAVOR@,$(cdbs_make_curflavor),$(or $(strip \
+ $(DEB_MAKE_DESTDIRSKEL_$(cdbs_make_curflavor))),$(strip \
+ $(DEB_MAKE_DESTDIRSKEL)))),\
+ $(cdbs_curdestdir)))
DEB_PHONY_RULES += makefile-clean $(cdbs_make_clean_nonstamps)
pre-build::
- $(if $(cdbs_make_flavors),mkdir -p debian/stamp-makefile-build debian/stamp-makefile-install)
- $(and $(cdbs_make_flavors),$(DEB_MAKE_CHECK_TARGET),mkdir -p debian/stamp-makefile-check)
+ $(if $(cdbs_make_flavors),\
+ mkdir -p \
+ debian/stamp-makefile-build \
+ debian/stamp-makefile-install)
+ $(and $(cdbs_make_flavors),$(DEB_MAKE_CHECK_TARGET),\
+ mkdir -p debian/stamp-makefile-check)
common-build-arch common-build-indep:: $(cdbs_make_build_stamps)
$(cdbs_make_build_stamps):
@@ -47,29 +73,52 @@ $(cdbs_make_build_stamps):
cleanbuilddir:: makefile-clean
makefile-clean:: $(if $(cdbs_make_flavors),$(cdbs_make_clean_nonstamps))
- $(if $(cdbs_make_flavors),-rmdir --ignore-fail-on-non-empty debian/stamp-makefile-build debian/stamp-makefile-install,rm -f debian/stamp-makefile-build debian/stamp-makefile-install)
+ $(if $(cdbs_make_flavors),\
+ -rmdir --ignore-fail-on-non-empty \
+ debian/stamp-makefile-build \
+ debian/stamp-makefile-install,\
+ rm -f \
+ debian/stamp-makefile-build \
+ debian/stamp-makefile-install)
$(cdbs_make_clean_nonstamps)::
- $(if $(DEB_MAKE_CLEAN_TARGET),+-$(DEB_MAKE_INVOKE) -k $(DEB_MAKE_CLEAN_TARGET), at echo "DEB_MAKE_CLEAN_TARGET unset, not running clean")
- $(if $(cdbs_make_flavors),rm -f $(@:makefile-clean%=debian/stamp-makefile-build%) $(@:makefile-clean%=debian/stamp-makefile-install%))
+ $(if $(DEB_MAKE_CLEAN_TARGET),\
+ +-$(DEB_MAKE_INVOKE) -k $(DEB_MAKE_CLEAN_TARGET),\
+ @echo "DEB_MAKE_CLEAN_TARGET unset, not running clean")
+ $(if $(cdbs_make_flavors),\
+ rm -f \
+ $(@:makefile-clean%=debian/stamp-makefile-build%) \
+ $(@:makefile-clean%=debian/stamp-makefile-install%))
common-install-arch common-install-indep:: common-install-impl
common-install-impl:: $(cdbs_make_install_stamps)
$(cdbs_make_install_stamps)::
- $(if $(DEB_MAKE_INSTALL_TARGET),+$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET), at echo "DEB_MAKE_INSTALL_TARGET unset, skipping default makefile.mk common-install target")
- $(if $(DEB_MAKE_INSTALL_TARGET),touch $@)
+ $(if $(DEB_MAKE_INSTALL_TARGET),\
+ +$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET),\
+ @echo "DEB_MAKE_INSTALL_TARGET unset, \
+ skipping default makefile.mk common-install target")
+ $(if $(DEB_MAKE_INSTALL_TARGET),\
+ touch $@)
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
common-build-arch common-build-indep:: $(cdbs_make_check_stamps)
$(cdbs_make_check_stamps) : debian/stamp-makefile-check% : debian/stamp-makefile-build%
- $(if $(DEB_MAKE_CHECK_TARGET),+$(DEB_MAKE_INVOKE) $(DEB_MAKE_CHECK_TARGET), at echo "DEB_MAKE_CHECK_TARGET unset, not running checks")
- $(if $(DEB_MAKE_CHECK_TARGET),touch $@)
+ $(if $(DEB_MAKE_CHECK_TARGET),\
+ +$(DEB_MAKE_INVOKE) $(DEB_MAKE_CHECK_TARGET),\
+ @echo "DEB_MAKE_CHECK_TARGET unset, not running checks")
+ $(if $(DEB_MAKE_CHECK_TARGET),\
+ touch $@)
makefile-clean::
- $(if $(DEB_MAKE_CHECK_TARGET),$(if $(cdbs_make_flavors),-rmdir --ignore-fail-on-non-empty debian/stamp-makefile-check,rm -f debian/stamp-makefile-check))
+ $(if $(DEB_MAKE_CHECK_TARGET),\
+ $(if $(cdbs_make_flavors),\
+ -rmdir --ignore-fail-on-non-empty \
+ debian/stamp-makefile-check,\
+ rm -f debian/stamp-makefile-check))
$(cdbs_make_clean_nonstamps)::
- $(if $(cdbs_make_flavors),rm -f $(@:makefile-clean%=debian/stamp-makefile-check%))
+ $(if $(cdbs_make_flavors),\
+ rm -f $(@:makefile-clean%=debian/stamp-makefile-check%))
endif
endif
diff --git a/1/class/pd.mk.in b/1/class/pd.mk.in
index 18a1726..ecdb3f7 100644
--- a/1/class/pd.mk.in
+++ b/1/class/pd.mk.in
@@ -47,10 +47,18 @@ testsanity::
# pd externals have the uncommon extension .pd_linux, which prevents them from
# being properly detected by dh_shlibdeps, so we do it manually
$(patsubst %,binary-strip-IMPL/%,$(DEB_ALL_PACKAGES)) ::
- $(if $(is_debug_package)$(filter nostrip,$(DEB_BUILD_OPTIONS)),,find "$(CURDIR)/debian/$(cdbs_curpkg)" -name "*.pd_linux" -exec strip --remove-section=.comment --remove-section=.note --strip-unneeded {} +)
+ $(if $(is_debug_package)$(filter nostrip,$(DEB_BUILD_OPTIONS)),\
+ ,\
+ find "$(CURDIR)/debian/$(cdbs_curpkg)" -name "*.pd_linux" \
+ -exec strip \
+ --remove-section=.comment \
+ --remove-section=.note \
+ --strip-unneeded {} +)
$(patsubst %,binary-predeb-IMPL/%,$(DEB_ALL_PACKAGES)) ::
- find "$(CURDIR)/debian/$(cdbs_curpkg)" -name "*.pd_linux" -exec dpkg-shlibdeps -Tdebian/$(cdbs_curpkg).substvars {} +
- find "$(CURDIR)/debian/$(cdbs_curpkg)" -name "*.pd_linux" -exec chmod 0644 {} +
+ find "$(CURDIR)/debian/$(cdbs_curpkg)" -name "*.pd_linux" \
+ -exec dpkg-shlibdeps -Tdebian/$(cdbs_curpkg).substvars {} +
+ find "$(CURDIR)/debian/$(cdbs_curpkg)" -name "*.pd_linux" \
+ -exec chmod 0644 {} +
#endif _cdbs_class_pd
endif
diff --git a/1/class/perl-build.mk.in b/1/class/perl-build.mk.in
index 41615fc..c80f047 100644
--- a/1/class/perl-build.mk.in
+++ b/1/class/perl-build.mk.in
@@ -34,21 +34,30 @@ cdbs_perl_module-build-tiny_check := $(shell \
grep -sl 'Module::Build::Tiny' \
$(DEB_PERL_SRCDIR)/Build.PL)
CDBS_BUILD_DEPENDS_class_perl-build_module-build ?= libmodule-build-perl
-CDBS_BUILD_DEPENDS_class_perl-build_module-build-tiny ?= libmodule-build-tiny-perl, cdbs (>= 0.4.122~)
+CDBS_BUILD_DEPENDS_class_perl-build_module-build-tiny ?= \
+ libmodule-build-tiny-perl, cdbs (>= 0.4.122~)
CDBS_BUILD_DEPENDS += $(strip $(if $(cdbs_perl_module-build-tiny_check),\
$(comma) $(CDBS_BUILD_DEPENDS_class_perl-build_module-build-tiny),\
$(comma) $(CDBS_BUILD_DEPENDS_class_perl-build_module-build)))
# Sanity check: DEB_PERL_SRCDIR must be declared early
cdbs_perl_srcdir_early := $(DEB_PERL_SRCDIR)
-cdbs_perl_srcdir_check = $(if $(call cdbs_streq,$(cdbs_perl_srcdir_early),$(DEB_PERL_SRCDIR)),,$(error DEB_PERL_SRCDIR must be set before including perl-build.mk, not after))
+cdbs_perl_srcdir_check = $(if $(call cdbs_streq,$(cdbs_perl_srcdir_early),$(DEB_PERL_SRCDIR)),\
+ ,\
+ $(error DEB_PERL_SRCDIR must be set before including perl-build.mk, \
+ not after))
# Sanity check: only DEB_PERL_SRCDIR == DEB_BUILDDIR is supported
# TODO: figure out if Module::Build supports custom builddir
-cdbs_perl_builddir_check = $(if $(call cdbs_streq,$(DEB_PERL_SRCDIR),$(DEB_BUILDDIR)),,$(error DEB_PERL_SRCDIR and DEB_BUILDDIR must be the same for Perl Module::Build builds))
+cdbs_perl_builddir_check = $(if $(call cdbs_streq,$(DEB_PERL_SRCDIR),$(DEB_BUILDDIR)),\
+ ,\
+ $(error DEB_PERL_SRCDIR and DEB_BUILDDIR must be the same \
+ for Perl Module::Build builds))
cdbs_perl_curbuilddir = $(cdbs_perl_builddir_check)$(cdbs_curbuilddir)
-cdbs_perl_curdestdir = $(cdbs_perl_builddir_check)$(or $(DEB_PERL_DESTDIR_$(cdbs_curpkg)),$(DEB_PERL_DESTDIR))
+cdbs_perl_curdestdir = $(cdbs_perl_builddir_check)$(or $(strip \
+ $(DEB_PERL_DESTDIR_$(cdbs_curpkg))),$(strip \
+ $(DEB_PERL_DESTDIR)))
# always be non-interactive
export AUTOMATED_TESTING = $(DEB_PERL_AUTOMATED_TESTING)
@@ -56,28 +65,47 @@ export AUTOMATED_TESTING = $(DEB_PERL_AUTOMATED_TESTING)
common-configure-arch common-configure-indep:: $(DEB_PERL_SRCDIR)/Build
$(DEB_PERL_SRCDIR)/Build:
$(cdbs_perl_srcdir_check)
- cd $(cdbs_perl_curbuilddir) && perl Build.PL $(DEB_PERL_BUILD_CONFIGURE_TARGET) $(DEB_PERL_CONFIGURE_ARGS) $(DEB_PERL_CONFIGURE_FLAGS)
+ cd $(cdbs_perl_curbuilddir) && \
+ perl Build.PL $(DEB_PERL_BUILD_CONFIGURE_TARGET) \
+ $(DEB_PERL_CONFIGURE_ARGS) \
+ $(DEB_PERL_CONFIGURE_FLAGS)
common-build-arch common-build-indep:: debian/stamp-perl-build
debian/stamp-perl-build:
- cd $(cdbs_perl_curbuilddir) && ./Build $(DEB_PERL_BUILD_TARGET) $(DEB_PERL_BUILD_ARGS) $(DEB_PERL_BUILD_FLAGS)
+ cd $(cdbs_perl_curbuilddir) && \
+ ./Build $(DEB_PERL_BUILD_TARGET) \
+ $(DEB_PERL_BUILD_ARGS) \
+ $(DEB_PERL_BUILD_FLAGS)
touch $@
common-build-arch common-build-indep:: debian/stamp-perl-check
debian/stamp-perl-check: debian/stamp-perl-build
- $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,$(if $(DEB_PERL_CHECK_TARGET),cd $(cdbs_perl_curbuilddir) && ./Build $(DEB_PERL_CHECK_TARGET) $(DEB_PERL_CHECK_ARGS) $(DEB_PERL_CHECK_FLAGS)))
+ $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),\
+ ,\
+ $(if $(DEB_PERL_CHECK_TARGET),\
+ cd $(cdbs_perl_curbuilddir) && \
+ ./Build $(DEB_PERL_CHECK_TARGET) \
+ $(DEB_PERL_CHECK_ARGS) \
+ $(DEB_PERL_CHECK_FLAGS)))
touch $@
# Drop packlist files after install, to respect Perl Policy 3.9.4 § 4.1
common-install-arch common-install-indep:: common-install-impl
common-install-impl::
- cd $(cdbs_perl_curbuilddir) && ./Build $(DEB_PERL_INSTALL_TARGET) $(DEB_PERL_INSTALL_ARGS) $(DEB_PERL_INSTALL_FLAGS)
+ cd $(cdbs_perl_curbuilddir) && \
+ ./Build $(DEB_PERL_INSTALL_TARGET) \
+ $(DEB_PERL_INSTALL_ARGS) \
+ $(DEB_PERL_INSTALL_FLAGS)
find $(cdbs_perl_curdestdir)/usr/lib -type f -name .packlist \
-exec rm -f '{}' ';' \
- -exec sh -c "dirname '{}' | xargs rmdir --ignore-fail-on-non-empty -p" ';'
+ -exec sh -c "dirname '{}' | \
+ xargs rmdir --ignore-fail-on-non-empty -p" ';'
clean::
- -cd $(cdbs_perl_curbuilddir) && ./Build $(DEB_PERL_CLEAN_TARGET) $(DEB_PERL_CLEAN_ARGS) $(DEB_PERL_CLEAN_FLAGS)
+ -cd $(cdbs_perl_curbuilddir) && \
+ ./Build $(DEB_PERL_CLEAN_TARGET) \
+ $(DEB_PERL_CLEAN_ARGS) \
+ $(DEB_PERL_CLEAN_FLAGS)
-rm -f debian/stamp-perl-build debian/stamp-perl-check
endif
diff --git a/1/class/perl-makemaker.mk.in b/1/class/perl-makemaker.mk.in
index 384de1a..49fd67f 100644
--- a/1/class/perl-makemaker.mk.in
+++ b/1/class/perl-makemaker.mk.in
@@ -31,7 +31,9 @@ include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
CDBS_BUILD_DEPENDS_class_perl-makemaker_perl ?= perl
CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_perl-makemaker_perl)
-cdbs_makemaker_builddir_check = $(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,$(error DEB_BUILDDIR and DEB_SRCDIR must be the same for Perl builds))
+cdbs_makemaker_builddir_check = $(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),\
+ ,\
+ $(error DEB_BUILDDIR and DEB_SRCDIR must be the same for Perl builds))
# always be non-interactive
export PERL_MM_USE_DEFAULT = 1
@@ -39,6 +41,7 @@ export AUTOMATED_TESTING = $(DEB_PERL_AUTOMATED_TESTING)
common-configure-arch common-configure-indep:: Makefile
Makefile:
- (cd $(DEB_BUILDDIR) && $(cdbs_makemaker_builddir_check)$(DEB_MAKEMAKER_INVOKE) )
+ (cd $(DEB_BUILDDIR) && \
+ $(cdbs_makemaker_builddir_check)$(DEB_MAKEMAKER_INVOKE) )
endif
diff --git a/1/class/perl-vars.mk.in b/1/class/perl-vars.mk.in
index 92abfa3..f4181e9 100644
--- a/1/class/perl-vars.mk.in
+++ b/1/class/perl-vars.mk.in
@@ -29,8 +29,8 @@ cdbs_perl_lddlflags := $(shell perl -MConfig -e 'print $$Config{lddlflags}')
DEB_PERL_PACKAGES ?= $(filter lib%-perl, $(DEB_PACKAGES))
-DEB_PERL_ARCH_PACKAGES ?= $(filter $(DEB_PERL_PACKAGES), $(DEB_ARCH_PACKAGES))
-DEB_PERL_INDEP_PACKAGES ?= $(filter $(DEB_PERL_PACKAGES), $(DEB_INDEP_PACKAGES))
+DEB_PERL_ARCH_PACKAGES ?= $(filter $(DEB_PERL_PACKAGES),$(DEB_ARCH_PACKAGES))
+DEB_PERL_INDEP_PACKAGES ?= $(filter $(DEB_PERL_PACKAGES),$(DEB_INDEP_PACKAGES))
# Use DEB_SRCDIR by default
DEB_PERL_SRCDIR ?= $(DEB_SRCDIR)
@@ -38,7 +38,9 @@ DEB_PERL_SRCDIR ?= $(DEB_SRCDIR)
# Install directly by default if there is only one perl library package
# To get default CDBS behaviour (CDBS_DESTDIR_pkg or else CDBS_DESTDIR),
# then set DEB_PERL_DESTDIR = $(cdbs_curdestdir)
-DEB_PERL_DESTDIR ?= $(if $(filter 1,$(words $(DEB_PERL_PACKAGES))),$(CURDIR)/debian/$(DEB_PERL_PACKAGES),$(cdbs_curdestdir))
+DEB_PERL_DESTDIR ?= $(if $(filter 1,$(words $(DEB_PERL_PACKAGES))),\
+ $(CURDIR)/debian/$(DEB_PERL_PACKAGES),\
+ $(cdbs_curdestdir))
# Avoid auto-building dependencies
export PERL_AUTOINSTALL = --skipdeps
diff --git a/1/class/perlmodule.mk.in b/1/class/perlmodule.mk.in
index 1f01771..6a266dd 100644
--- a/1/class/perlmodule.mk.in
+++ b/1/class/perlmodule.mk.in
@@ -47,6 +47,7 @@ export AUTOMATED_TESTING = $(DEB_PERL_AUTOMATED_TESTING)
common-configure-arch common-configure-indep:: Makefile
Makefile:
- (cd $(DEB_BUILDDIR) && $(cdbs_makemaker_builddir_check)$(DEB_MAKEMAKER_INVOKE) )
+ (cd $(DEB_BUILDDIR) && \
+ $(cdbs_makemaker_builddir_check)$(DEB_MAKEMAKER_INVOKE) )
endif
diff --git a/1/class/python-autotools.mk.in b/1/class/python-autotools.mk.in
index bf4ed2c..95efa42 100644
--- a/1/class/python-autotools.mk.in
+++ b/1/class/python-autotools.mk.in
@@ -24,7 +24,9 @@ include $(_cdbs_class_path)/python-module.mk$(_cdbs_makefile_suffix)
# Flavors are used if more than a single Python build is needed
# Used in implicit rules, so must be set before including makefile
-DEB_MAKE_FLAVORS ?= $(if $(word 2,$(cdbs_python_build_versions)),$(cdbs_python_build_versions))
+DEB_MAKE_FLAVORS ?= $(strip \
+ $(if $(word 2,$(cdbs_python_build_versions)),\
+ $(cdbs_python_build_versions)))
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
@@ -39,7 +41,9 @@ CDBS_BUILD_DEPENDS_class_python-autotools_python ?= $(cdbs_python_builddeps)
CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-autotools_python)
# FIXME: Restructure to allow early override
-DEB_CONFIGURE_SCRIPT_ENV += PYTHON="$(or $(python$(cdbs_python$(cdbs_curpythonstem)_nondefault_version):%=python%),$(call cdbs_python_binary,python$(if $(cdbs_make_flavors),$(cdbs_make_curflavor))))"
+DEB_CONFIGURE_SCRIPT_ENV += PYTHON="$(or $(strip \
+ $(python$(cdbs_python$(cdbs_curpythonstem)_nondefault_version):%=python%)),$(strip \
+ $(call cdbs_python_binary,python$(if $(cdbs_make_flavors),$(cdbs_make_curflavor)))))"
# Install all flavors on top of each other by default
DEB_MAKE_DESTDIRSKEL = $(cdbs_curdestdir)
diff --git a/1/class/python-distutils.mk.in b/1/class/python-distutils.mk.in
index b6e6596..5b10c7a 100644
--- a/1/class/python-distutils.mk.in
+++ b/1/class/python-distutils.mk.in
@@ -49,12 +49,17 @@ DEB_PYTHON_MODULE_PACKAGE = $(strip $(call cdbs_warn_deprecated,\
DEB_PYTHON_MODULE_PACKAGE,0.4.54,DEB_PYTHON_MODULE_PACKAGES)\
$(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES))))
-cdbs_python_distutils_srcdir = $(or $(DEB_PYTHON_DISTUTILS_SRCDIR),$(DEB_SRCDIR))
+cdbs_python_distutils_srcdir = $(or $(strip \
+ $(DEB_PYTHON_DISTUTILS_SRCDIR)),$(strip\
+ $(DEB_SRCDIR)))
cdbs_python_setup_cmd = $(call cdbs_expand_curvar,DEB_PYTHON_SETUP_CMD)
cdbs_python_build_args = $(call cdbs_expand_curvar,DEB_PYTHON_BUILD_ARGS)
cdbs_python_install_args = $(call cdbs_expand_curvar,DEB_PYTHON_INSTALL_ARGS)
cdbs_python_clean_args = $(call cdbs_expand_curvar,DEB_PYTHON_CLEAN_ARGS)
-cdbs_expand_python_distutils_installdir = $(subst @PYTHONBINARY@,$1,$(or $(DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL),/usr/lib/@PYTHONBINARY@/site-packages/))
+cdbs_expand_python_distutils_installdir = $(strip \
+ $(subst @PYTHONBINARY@,$1,$(or $(strip \
+ $(DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL)),$(strip \
+ /usr/lib/@PYTHONBINARY@/site-packages/))))
# prepare sanity checks
cdbs_python_packages_pre := $(cdbs_python_arch_packages)$(cdbs_python_indep_packages)
@@ -80,10 +85,12 @@ CDBS_BUILD_DEPENDS_class_python-distutils ?= $(cdbs_python_builddeps_cdbs)
CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-distutils)
CDBS_BUILD_DEPENDS_cdbs_python-distutils_srcdir ?= cdbs (>= 0.4.97~)
-CDBS_BUILD_DEPENDS += $(if $(DEB_PYTHON_DISTUTILS_SRCDIR),$(CDBS_BUILD_DEPENDS_cdbs_python-distutils_srcdir))
+CDBS_BUILD_DEPENDS += $(if $(DEB_PYTHON_DISTUTILS_SRCDIR),\
+ $(CDBS_BUILD_DEPENDS_cdbs_python-distutils_srcdir))
CDBS_BUILD_DEPENDS_cdbs_python-distutils_installdir ?= cdbs (>= 0.4.91~)
-CDBS_BUILD_DEPENDS += $(if $(DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL),$(CDBS_BUILD_DEPENDS_cdbs_python-distutils_installdir))
+CDBS_BUILD_DEPENDS += $(if $(DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL),\
+ $(CDBS_BUILD_DEPENDS_cdbs_python-distutils_installdir))
# Python-related dependencies according to Python policy, appendix A
CDBS_BUILD_DEPENDS_class_python-distutils_python ?= $(cdbs_python_builddeps)
@@ -106,8 +113,9 @@ $(patsubst %,build/%,$(cdbs_python_indep_packages) $(cdbs_python_arch_packages))
$(patsubst %,debian/python-module-stampdir/%,$(cdbs_python_indep_packages)) :: debian/python-module-stampdir/%:
cd $(cdbs_python_distutils_srcdir) && \
- $(cdbs_curpythonindepbinary) $(cdbs_python_setup_cmd) build \
- $(cdbs_python_build_args)
+ $(cdbs_curpythonindepbinary) \
+ $(cdbs_python_setup_cmd) build \
+ $(cdbs_python_build_args)
touch $@
$(patsubst %,debian/python-module-stampdir/%,$(cdbs_python_arch_packages)) :: debian/python-module-stampdir/%:
@@ -123,10 +131,11 @@ $(patsubst %,debian/python-module-stampdir/%,$(cdbs_python_arch_packages)) :: de
# install stage
$(patsubst %,install/%,$(cdbs_python_indep_packages)) :: install/%: python-install-py
cd $(cdbs_python_distutils_srcdir) && \
- $(cdbs_curpythonindepbinary) $(cdbs_python_setup_cmd) install \
- --root="$(cdbs_python_destdir)" \
- --install-purelib=$(call cdbs_expand_python_distutils_installdir,$(cdbs_curpythonpribinary)) \
- $(cdbs_python_install_args)
+ $(cdbs_curpythonindepbinary) \
+ $(cdbs_python_setup_cmd) install \
+ --root="$(cdbs_python_destdir)" \
+ --install-purelib=$(call cdbs_expand_python_distutils_installdir,$(cdbs_curpythonpribinary)) \
+ $(cdbs_python_install_args)
$(patsubst %,install/%,$(cdbs_python_arch_packages)) :: install/%: $(addprefix python-install-, $(cdbs_python_build_versions))
set -e; \
@@ -149,8 +158,9 @@ clean:: $(patsubst %,python-module-clean/%,$(cdbs_python_indep_packages) $(cdbs_
$(patsubst %,python-module-clean/%,$(cdbs_python_indep_packages)) :: python-module-clean/%:
-cd $(cdbs_python_distutils_srcdir) && \
- $(cdbs_curpythonindepbinary) $(cdbs_python_setup_cmd) clean \
- $(cdbs_python_clean_args)
+ $(cdbs_curpythonindepbinary) \
+ $(cdbs_python_setup_cmd) clean \
+ $(cdbs_python_clean_args)
$(patsubst %,python-module-clean/%,$(cdbs_python_arch_packages)) :: python-module-clean/%:
-cd $(cdbs_python_distutils_srcdir) && \
diff --git a/1/class/python-module.mk.in b/1/class/python-module.mk.in
index 97598ed..bbbe557 100644
--- a/1/class/python-module.mk.in
+++ b/1/class/python-module.mk.in
@@ -34,24 +34,53 @@ CDBS_BUILD_DEPENDS_class_python-module_pycentral ?= python-central
# dh_python2 comes from python package
CDBS_BUILD_DEPENDS_class_python-module_python2 ?= python
CDBS_BUILD_DEPENDS_class_python-module_python3 ?= python3
-CDBS_BUILD_DEPENDS += $(if $(cdbs_python_pysupport),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pysupport))
-CDBS_BUILD_DEPENDS += $(if $(cdbs_python_pycentral),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pycentral))
-CDBS_BUILD_DEPENDS += $(if $(cdbs_python2),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python2))
-CDBS_BUILD_DEPENDS += $(if $(cdbs_python3),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python3))
+CDBS_BUILD_DEPENDS += $(strip \
+ $(if $(cdbs_python_pysupport),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pysupport)))
+CDBS_BUILD_DEPENDS += $(strip \
+ $(if $(cdbs_python_pycentral),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pycentral)))
+CDBS_BUILD_DEPENDS += $(strip \
+ $(if $(cdbs_python2),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python2)))
+CDBS_BUILD_DEPENDS += $(strip \
+ $(if $(cdbs_python3),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python3)))
CDBS_BUILD_DEPENDS_class_python-module_args ?= cdbs (>= 0.4.97~)
-CDBS_BUILD_DEPENDS += $(if $(call cdbs_expand_allvars,DEB_DH_PYTHONHELPER_ARGS DEB_PYTHON_PRIVATE_MODULES_DIRS),$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_args))
+CDBS_BUILD_DEPENDS += $(strip \
+ $(if $(call cdbs_expand_allvars,DEB_DH_PYTHONHELPER_ARGS DEB_PYTHON_PRIVATE_MODULES_DIRS),\
+ $(comma) $(CDBS_BUILD_DEPENDS_class_python-module_args)))
-$(patsubst %,testsanity/%,$(DEB_ALL_PACKAGES)) :: testsanity/% :
- $(if $(word 2,$(cdbs_curpythonsystems)),$(error binary package $(cdbs_curpkg) use both "python2" and "python3" packaging systems - either explicitly set DEB_PYTHON2_PACKAGES and/or DEB_PYTHON3_PACKAGES or set an alternative DEB_PYTHON_SYSTEM))
+$(patsubst %,testsanity/%,$(DEB_ALL_PACKAGES)) :: testsanity/% :
+ $(if $(word 2,$(cdbs_curpythonsystems)),$(error \
+ binary package $(cdbs_curpkg) use both "python2" and \
+ "python3" packaging systems - either explicitly set \
+ DEB_PYTHON2_PACKAGES and/or DEB_PYTHON3_PACKAGES \
+ or set an alternative DEB_PYTHON_SYSTEM))
# Optionally use debhelper (if not then these rules are simply ignored)
# * invoke for all binary packages with legacy helpers (see bug#377965)
# * invoke public and private modules separately with default helpers
$(patsubst %,binary-post-install/%,$(DEB_PACKAGES)) :: binary-post-install/%: binary-install-python/%
$(patsubst %,binary-install-python/%,$(DEB_PACKAGES)) :: binary-install-python/%: binary-install/%
- $(if $(DEB_PYTHON_SYSTEM),dh_$(cdbs_curpythonsystems) -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_PYTHONHELPER_ARGS) $(call cdbs_expand_curvar,DEB_PYTHON_PRIVATE_MODULES_DIRS))
- $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_curpythonsystems),dh_$(cdbs_curpythonsystems) -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_PYTHONHELPER_ARGS)))
- $(if $(DEB_PYTHON_SYSTEM),,$(and $(cdbs_curpythonsystems),$(call cdbs_expand_curvar,DEB_PYTHON_PRIVATE_MODULES_DIRS),dh_$(cdbs_curpythonsystems) -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_PYTHONHELPER_ARGS) $(call cdbs_expand_curvar,DEB_PYTHON_PRIVATE_MODULES_DIRS)))
+ $(if $(DEB_PYTHON_SYSTEM),\
+ dh_$(cdbs_curpythonsystems) \
+ -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_PYTHONHELPER_ARGS) \
+ $(call cdbs_expand_curvar,DEB_PYTHON_PRIVATE_MODULES_DIRS))
+ $(if $(DEB_PYTHON_SYSTEM),\
+ ,\
+ $(if $(cdbs_curpythonsystems),\
+ dh_$(cdbs_curpythonsystems) \
+ -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_PYTHONHELPER_ARGS)))
+ $(if $(DEB_PYTHON_SYSTEM),\
+ ,\
+ $(and $(cdbs_curpythonsystems),$(call cdbs_expand_curvar,DEB_PYTHON_PRIVATE_MODULES_DIRS),\
+ dh_$(cdbs_curpythonsystems) \
+ -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_PYTHONHELPER_ARGS) \
+ $(call cdbs_expand_curvar,DEB_PYTHON_PRIVATE_MODULES_DIRS)))
endif
diff --git a/1/class/python-sugar.mk.in b/1/class/python-sugar.mk.in
index 4b2db08..51c71f1 100644
--- a/1/class/python-sugar.mk.in
+++ b/1/class/python-sugar.mk.in
@@ -79,7 +79,8 @@ CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-sugar_python)
CDBS_BUILD_DEPENDS += $(cdbs_python_sugar_pkg_check)
# Sugar-related dependencies
-CDBS_BUILD_DEPENDS_class_python-sugar_sugar ?= $(call cdbs_sugar_anybranchdeps,python-sugar python-sugar-toolkit), unzip
+CDBS_BUILD_DEPENDS_class_python-sugar_sugar ?= \
+ $(call cdbs_sugar_anybranchdeps,python-sugar python-sugar-toolkit), unzip
CDBS_BUILD_DEPENDS += $(comma) $(CDBS_BUILD_DEPENDS_class_python-sugar_sugar)
# warn early about late changes to DEB_PYTHON_SUGAR_PACKAGES
@@ -90,15 +91,26 @@ pre-build::
mkdir -p debian/stamps-configure
$(patsubst %,build/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: build/%:
- [ ! -e $(cdbs_cursrcdir)/MANIFEST ] || [ -e $(cdbs_cursrcdir)/MANIFEST.upstream ] || mv $(cdbs_cursrcdir)/MANIFEST $(cdbs_cursrcdir)/MANIFEST.upstream
- [ ! -e $(cdbs_cursrcdir)/MANIFEST.upstream ] || egrep -v '^locale/.*/(.*\.mo|activity\.linfo)$$' $(cdbs_cursrcdir)/MANIFEST.upstream > $(cdbs_cursrcdir)/MANIFEST
+ [ ! -e $(cdbs_cursrcdir)/MANIFEST ] \
+ || [ -e $(cdbs_cursrcdir)/MANIFEST.upstream ] \
+ || mv $(cdbs_cursrcdir)/MANIFEST \
+ $(cdbs_cursrcdir)/MANIFEST.upstream
+ [ ! -e $(cdbs_cursrcdir)/MANIFEST.upstream ] \
+ || egrep -v '^locale/.*/(.*\.mo|activity\.linfo)$$' \
+ $(cdbs_cursrcdir)/MANIFEST.upstream \
+ > $(cdbs_cursrcdir)/MANIFEST
set -e; \
$(foreach buildver,$(cdbs_curpythonbuildversions),\
$(call cdbs_python_binary,python$(buildver)) \
$(cdbs_cursrcdir)/setup.py build; )
- [ ! -e $(cdbs_cursrcdir)/MANIFEST.upstream ] || IFS="`printf '\n'`" find "$(cdbs_cursrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \
- echo "$$path" | sed 's!^$(cdbs_cursrcdir)/!!' >> $(cdbs_cursrcdir)/MANIFEST; \
- done
+ [ ! -e $(cdbs_cursrcdir)/MANIFEST.upstream ] \
+ || IFS="`printf '\n'`" find "$(cdbs_cursrcdir)/locale" \
+ -type f \( -name '*.mo' -or -name 'activity.linfo' \) \
+ | while read path; do \
+ echo "$$path" \
+ | sed 's!^$(cdbs_cursrcdir)/!!' \
+ >> $(cdbs_cursrcdir)/MANIFEST; \
+ done
$(patsubst %,install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: install/%:
mkdir -p $(DEB_DESTDIR)usr/share/sugar/activities
@@ -112,18 +124,26 @@ $(patsubst %,install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: install/%:
# Replace superfluous COPYING files with symlinks
$(patsubst %,binary-post-install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: binary-post-install/%:
! test -f $(DEB_DESTDIR)/usr/share/sugar/activities/*.activity/COPYING \
- || ! diff -wq /usr/share/common-licenses/GPL-2 $(DEB_DESTDIR)/usr/share/sugar/activities/*.activity/COPYING \
- || ln -sfT ../../../common-licenses/GPL-2 $(DEB_DESTDIR)/usr/share/sugar/activities/*.activity/COPYING
+ || ! diff -wq /usr/share/common-licenses/GPL-2 \
+ $(DEB_DESTDIR)/usr/share/sugar/activities/*.activity/COPYING \
+ || ln -sfT ../../../common-licenses/GPL-2 \
+ $(DEB_DESTDIR)/usr/share/sugar/activities/*.activity/COPYING
reverse-config:: $(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES))
-$(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar-reverse-config/% :
- [ ! -e $(cdbs_cursrcdir)/MANIFEST.upstream ] || mv -f $(cdbs_cursrcdir)/MANIFEST.upstream $(cdbs_cursrcdir)/MANIFEST
-
-$(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar/% :
- -IFS="`printf '\n'`" find "$(cdbs_cursrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \
- rm -f "$$path"; \
- rmdir --ignore-fail-on-non-empty "`dirname "$$path"`"; \
- done
- -rmdir --ignore-fail-on-non-empty "$(cdbs_cursrcdir)/locale"
+$(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar-reverse-config/% :
+ [ ! -e $(cdbs_cursrcdir)/MANIFEST.upstream ] \
+ || mv -f $(cdbs_cursrcdir)/MANIFEST.upstream \
+ $(cdbs_cursrcdir)/MANIFEST
+
+$(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar/% :
+ -IFS="`printf '\n'`" find "$(cdbs_cursrcdir)/locale" \
+ -type f \( -name '*.mo' -or -name 'activity.linfo' \) \
+ | while read path; do \
+ rm -f "$$path"; \
+ rmdir --ignore-fail-on-non-empty \
+ "`dirname "$$path"`"; \
+ done
+ -rmdir --ignore-fail-on-non-empty \
+ "$(cdbs_cursrcdir)/locale"
endif
diff --git a/1/class/python-vars.mk.in b/1/class/python-vars.mk.in
index 433a50b..7ac5903 100644
--- a/1/class/python-vars.mk.in
+++ b/1/class/python-vars.mk.in
@@ -45,29 +45,70 @@ include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
#DEB_PYTHON_SRCDIR = $(DEB_DESTDIR)
#DEB_PYTHON_DESTDIR = $(DEB_DESTDIR)
-cdbs_python_potential_packages = $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES))
-cdbs_python_legacy_packages = $(or $(DEB_PYTHON_MODULE_PACKAGES),$(firstword $(cdbs_python_potential_packages)))
-cdbs_python2_packages = $(if $(DEB_PYTHON2_MODULE_PACKAGES)$(DEB_PYTHON3_MODULE_PACKAGES),$(DEB_PYTHON2_MODULE_PACKAGES),$(filter python-%,$(cdbs_python_potential_packages)))
-cdbs_python3_packages = $(if $(DEB_PYTHON2_MODULE_PACKAGES)$(DEB_PYTHON3_MODULE_PACKAGES),$(DEB_PYTHON3_MODULE_PACKAGES),$(filter python3-%,$(cdbs_python_potential_packages)))
-cdbs_python_packages = $(if $(DEB_PYTHON_SYSTEM),$(cdbs_python_legacy_packages),$(cdbs_python2_packages) $(cdbs_python3_packages))
-cdbs_python2_arch_packages = $(filter $(cdbs_python2_packages),$(DEB_ARCH_PACKAGES))
-cdbs_python3_arch_packages = $(filter $(cdbs_python3_packages),$(DEB_ARCH_PACKAGES))
-cdbs_python_arch_packages = $(filter $(cdbs_python_packages),$(DEB_ARCH_PACKAGES))
-cdbs_python2_indep_packages = $(filter $(cdbs_python2_packages),$(DEB_INDEP_PACKAGES))
-cdbs_python3_indep_packages = $(filter $(cdbs_python3_packages),$(DEB_INDEP_PACKAGES))
-cdbs_python_indep_packages = $(filter $(cdbs_python_packages), $(DEB_INDEP_PACKAGES))
+cdbs_python_potential_packages = $(strip \
+ $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
+cdbs_python_legacy_packages = $(or $(strip \
+ $(DEB_PYTHON_MODULE_PACKAGES)),$(strip \
+ $(firstword $(cdbs_python_potential_packages))))
+cdbs_python2_packages = $(strip \
+ $(if $(DEB_PYTHON2_MODULE_PACKAGES)$(DEB_PYTHON3_MODULE_PACKAGES),\
+ $(DEB_PYTHON2_MODULE_PACKAGES),\
+ $(filter python-%,$(cdbs_python_potential_packages))))
+cdbs_python3_packages = $(strip \
+ $(if $(DEB_PYTHON2_MODULE_PACKAGES)$(DEB_PYTHON3_MODULE_PACKAGES),\
+ $(DEB_PYTHON3_MODULE_PACKAGES),\
+ $(filter python3-%,$(cdbs_python_potential_packages))))
+cdbs_python_packages = $(strip \
+ $(if $(DEB_PYTHON_SYSTEM),\
+ $(cdbs_python_legacy_packages),\
+ $(cdbs_python2_packages) $(cdbs_python3_packages)))
+cdbs_python2_arch_packages = $(strip \
+ $(filter $(cdbs_python2_packages),$(DEB_ARCH_PACKAGES)))
+cdbs_python3_arch_packages = $(strip \
+ $(filter $(cdbs_python3_packages),$(DEB_ARCH_PACKAGES)))
+cdbs_python_arch_packages = $(strip \
+ $(filter $(cdbs_python_packages),$(DEB_ARCH_PACKAGES)))
+cdbs_python2_indep_packages = $(strip \
+ $(filter $(cdbs_python2_packages),$(DEB_INDEP_PACKAGES)))
+cdbs_python3_indep_packages = $(strip \
+ $(filter $(cdbs_python3_packages),$(DEB_INDEP_PACKAGES)))
+cdbs_python_indep_packages = $(strip \
+ $(filter $(cdbs_python_packages), $(DEB_INDEP_PACKAGES)))
cdbs_python_destdir = $(or $(DEB_PYTHON_DESTDIR),$(DEB_DESTDIR))
cdbs_python_pysupport = $(filter pysupport,$(DEB_PYTHON_SYSTEM))
cdbs_python_pycentral = $(filter pycentral,$(DEB_PYTHON_SYSTEM))
-cdbs_python_legacy_system = $(or $(cdbs_python_pysupport),$(cdbs_python_pycentral),$(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral, or leave empty for default python2/python3)))
-cdbs_python2 = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python2_packages),python2))
-cdbs_python3 = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python3_packages),python3))
-cdbs_python_systems = $(if $(DEB_PYTHON_SYSTEM),$(cdbs_python_legacy_system),$(if $(cdbs_python2_packages),python2) $(if $(cdbs_python3_packages),python3))
+cdbs_python_legacy_system = $(or $(strip \
+ $(cdbs_python_pysupport)),$(strip \
+ $(cdbs_python_pycentral)),\
+ $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) \
+ (select either pysupport or pycentral, or leave empty \
+ for default python2/python3))))
+cdbs_python2 = $(strip \
+ $(if $(DEB_PYTHON_SYSTEM),\
+ ,\
+ $(if $(cdbs_python2_packages),\
+ python2)))
+cdbs_python3 = $(strip \
+ $(if $(DEB_PYTHON_SYSTEM),\
+ ,\
+ $(if $(cdbs_python3_packages),\
+ python3)))
+cdbs_python_systems = $(strip \
+ $(if $(DEB_PYTHON_SYSTEM),\
+ $(cdbs_python_legacy_system),\
+ $(if $(cdbs_python2_packages),\
+ python2) \
+ $(if $(cdbs_python3_packages),\
+ python3)))
cdbs_python_stem = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python3_packages),3))
-cdbs_python_stem += $(if $(word 2,$(cdbs_python_systems)),$(error use of both "python2" and "python3" packaging systems is unsupported here - either change target binary package names, explicitly set DEB_PYTHON2_PACKAGES and/or DEB_PYTHON3_PACKAGES or set an alternative DEB_PYTHON_SYSTEM))
+cdbs_python_stem += $(strip \
+ $(if $(word 2,$(cdbs_python_systems)),$(error \
+ use of both "python2" and "python3" packaging systems is unsupported here - \
+ either change target binary package names, explicitly set \
+ DEB_PYTHON2_PACKAGES and/or DEB_PYTHON3_PACKAGES or set an alternative DEB_PYTHON_SYSTEM)))
# Calculate cdbs_python_build_versions
cdbs_python_current_version := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_python2),$(shell pyversions -vd))
@@ -79,39 +120,103 @@ cdbs_python3_first_supported_version = $(firstword $(strip $(sort $(cdbs_python3
# Non-default Python version used (only valid for arch-indendent builds)
# arch(+indep): none; indep: none if current is supported, else first supported
-cdbs_python_nondefault_version = $(if $(cdbs_python_arch_packages),,$(if $(filter $(cdbs_python_current_version),$(cdbs_python_supported_versions)),,$(cdbs_python_first_supported_version)))
-cdbs_python3_nondefault_version = $(if $(cdbs_python_arch_packages),,$(if $(filter $(cdbs_python3_current_version),$(cdbs_python3_supported_versions)),,$(cdbs_python3_first_supported_version)))
-
-cdbs_python_primary_version = $(or $(cdbs_python_nondefault_version),$(cdbs_python_current_version))
-cdbs_python3_primary_version = $(or $(cdbs_python3_nondefault_version),$(cdbs_python3_current_version))
-
+cdbs_python_nondefault_version = $(strip \
+ $(if $(cdbs_python_arch_packages),\
+ ,\
+ $(if $(filter $(cdbs_python_current_version),$(cdbs_python_supported_versions)),\
+ ,\
+ $(cdbs_python_first_supported_version))))
+cdbs_python3_nondefault_version = $(strip \
+ $(if $(cdbs_python_arch_packages),\
+ ,\
+ $(if $(filter $(cdbs_python3_current_version),$(cdbs_python3_supported_versions)),\
+ ,\
+ $(cdbs_python3_first_supported_version))))
+cdbs_python_primary_version = $(or $(strip \
+ $(cdbs_python_nondefault_version)),$(strip \
+ $(cdbs_python_current_version)))
+cdbs_python3_primary_version = $(or $(strip \
+ $(cdbs_python3_nondefault_version)),$(strip \
+ $(cdbs_python3_current_version)))
# arch(+indep): all; indep: current if supported, else first supported
-cdbs_python_build_versions = $(or $(if $(cdbs_python_arch_packages),$(cdbs_python_supported_versions)),$(cdbs_python_primary_version))
-cdbs_python3_build_versions = $(or $(if $(cdbs_python_arch_packages),$(cdbs_python3_supported_versions)),$(cdbs_python3_primary_version))
+cdbs_python_build_versions = $(or $(strip \
+ $(if $(cdbs_python_arch_packages),\
+ $(cdbs_python_supported_versions))),$(strip \
+ $(cdbs_python_primary_version)))
+cdbs_python3_build_versions = $(or $(strip \
+ $(if $(cdbs_python_arch_packages),\
+ $(cdbs_python3_supported_versions))),$(strip \
+ $(cdbs_python3_primary_version)))
cdbs_python_current_binary := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_python2),$(shell pyversions -d))
cdbs_python3_current_binary := $(if $(cdbs_python3),$(shell py3versions -d))
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python$(cdbs_curpythonstem)_current_binary),$(1)),python$(cdbs_curpythonstem),$(1))
-
-cdbs_curpythonsystems = $(if $(DEB_PYTHON_SYSTEM),$(cdbs_python_legacy_system),$(strip $(if $(filter $(cdbs_curpkg),$(cdbs_python2_packages)),python2) $(if $(filter $(cdbs_curpkg),$(cdbs_python3_packages)),python3)))
-cdbs_curpythonstem = $(if $(cdbs_python_single_system),$(cdbs_python_stem),$(if $(filter $(cdbs_curpkg),$(cdbs_python3_packages)),3))
-cdbs_curpythonindepbinary = python$(or $(cdbs_python$(cdbs_curpythonstem)_nondefault_version),$(cdbs_curpythonstem))
+cdbs_python_binary = $(strip \
+ $(if $(call cdbs_streq,$(cdbs_python$(cdbs_curpythonstem)_current_binary),$(1)),\
+ python$(cdbs_curpythonstem),\
+ $(1)))
+
+cdbs_curpythonsystems = $(strip $(if $(DEB_PYTHON_SYSTEM),\
+ $(cdbs_python_legacy_system),\
+ $(strip \
+ $(if $(filter $(cdbs_curpkg),$(cdbs_python2_packages)),\
+ python2) \
+ $(if $(filter $(cdbs_curpkg),$(cdbs_python3_packages)),\
+ python3))))
+cdbs_curpythonstem = $(strip \
+ $(if $(cdbs_python_single_system),\
+ $(cdbs_python_stem),\
+ $(if $(filter $(cdbs_curpkg),$(cdbs_python3_packages)),\
+ 3)))
+cdbs_curpythonindepbinary = python$(or $(strip \
+ $(cdbs_python$(cdbs_curpythonstem)_nondefault_version)),$(strip \
+ $(cdbs_curpythonstem)))
cdbs_curpythonpribinary = python$(cdbs_python$(cdbs_curpythonstem)_primary_version)
cdbs_curpythonbuildversions = $(cdbs_python$(cdbs_curpythonstem)_build_versions)
# Python-related dependencies according to Python policy, appendix A
# * Arch-independent Python 3 was broken until 0.4.93~
-cdbs_python_builddeps_legacy = $(if $(DEB_PYTHON_SYSTEM),$(if $(cdbs_python_arch_packages),python-all-dev,python-dev (>= 2.3.5-7)$(cdbs_python_nondefault_version:%=, python%-dev)))
-cdbs_python2_builddeps = $(if $(cdbs_python2),$(if $(cdbs_python2_arch_packages),python-all-dev,python-dev (>= 2.3.5-7)$(cdbs_python_nondefault_version:%=, python%-dev)))
-cdbs_python3_builddeps = $(if $(cdbs_python3),$(if $(cdbs_python3_arch_packages),python3-all-dev (>= 3.1),python3-dev$(cdbs_python3_nondefault_version:%=, python%-dev)))
-cdbs_python_builddeps = $(cdbs_python_builddeps_legacy), $(cdbs_python2_builddeps), $(cdbs_python3_builddeps)
-cdbs_python_builddeps_cdbs = $(if $(cdbs_python3_indep_packages),$(comma) cdbs (>= 0.4.93~),$(if $(cdbs_python2)$(cdbs_python3),$(comma) cdbs (>= 0.4.90~)))
+cdbs_python_builddeps_legacy = $(if $(DEB_PYTHON_SYSTEM),\
+ $(if $(cdbs_python_arch_packages),\
+ python-all-dev,\
+ python-dev (>= 2.3.5-7)\
+ $(cdbs_python_nondefault_version:%=, python%-dev)))
+cdbs_python2_builddeps = $(if $(cdbs_python2),\
+ $(if $(cdbs_python2_arch_packages),\
+ python-all-dev,\
+ python-dev (>= 2.3.5-7)\
+ $(cdbs_python_nondefault_version:%=, python%-dev)))
+cdbs_python3_builddeps = $(if $(cdbs_python3),\
+ $(if $(cdbs_python3_arch_packages),\
+ python3-all-dev (>= 3.1),\
+ python3-dev\
+ $(cdbs_python3_nondefault_version:%=, python%-dev)))
+cdbs_python_builddeps = \
+ $(cdbs_python_builddeps_legacy), \
+ $(cdbs_python2_builddeps), \
+ $(cdbs_python3_builddeps)
+cdbs_python_builddeps_cdbs = $(strip \
+ $(if $(cdbs_python3_indep_packages),\
+ $(comma) cdbs (>= 0.4.93~),\
+ $(if $(cdbs_python2)$(cdbs_python3),\
+ $(comma) cdbs (>= 0.4.90~))))
# check if build is possible
-$(if $(cdbs_python_pysupport),$(if $(cdbs_python_build_versions),,$(error invalid setting in debian/pyversions)))
-$(if $(cdbs_python_pycentral),$(if $(cdbs_python_build_versions),,$(error invalid setting for XS-Python-Version)))
-$(if $(cdbs_python2),$(if $(cdbs_python_build_versions),,$(error invalid setting for X-Python-Version)))
-$(if $(cdbs_python3),$(if $(cdbs_python3_build_versions),,$(error invalid setting for X-Python3-Version)))
+$(if $(cdbs_python_pysupport),\
+ $(if $(cdbs_python_build_versions),\
+ ,\
+ $(error invalid setting in debian/pyversions)))
+$(if $(cdbs_python_pycentral),\
+ $(if $(cdbs_python_build_versions),\
+ ,\
+ $(error invalid setting for XS-Python-Version)))
+$(if $(cdbs_python2),\
+ $(if $(cdbs_python_build_versions),\
+ ,\
+ $(error invalid setting for X-Python-Version)))
+$(if $(cdbs_python3),\
+ $(if $(cdbs_python3_build_versions),\
+ ,\
+ $(error invalid setting for X-Python3-Version)))
# deprecated variables
cdbs_python_selected_pyversions = $(strip $(call cdbs_warn_deprecated,\
diff --git a/1/class/qmake.mk.in b/1/class/qmake.mk.in
index ac658f8..38ae564 100644
--- a/1/class/qmake.mk.in
+++ b/1/class/qmake.mk.in
@@ -39,9 +39,20 @@ endif
common-configure-arch common-configure-indep:: common-configure-impl
common-configure-impl:: $(DEB_BUILDDIR)/Makefile
$(DEB_BUILDDIR)/Makefile:
- cd $(DEB_BUILDDIR) && $(QMAKE) $(DEB_QMAKE_ARGS) $(if $(DEB_QMAKE_CONFIG_VAL),'CONFIG += $(DEB_QMAKE_CONFIG_VAL)') 'QMAKE_CC = $(CC)' 'QMAKE_CXX = $(CXX)' 'QMAKE_CFLAGS_RELEASE = $(CPPFLAGS) $(CFLAGS)' 'QMAKE_CXXFLAGS_RELEASE = $(CPPFLAGS) $(CXXFLAGS)' 'QMAKE_LFLAGS_RELEASE = $(LDFLAGS)'
+ cd $(DEB_BUILDDIR) \
+ && $(QMAKE) \
+ $(DEB_QMAKE_ARGS) \
+ $(if $(DEB_QMAKE_CONFIG_VAL),\
+ 'CONFIG += $(DEB_QMAKE_CONFIG_VAL)') \
+ 'QMAKE_CC = $(CC)' \
+ 'QMAKE_CXX = $(CXX)' \
+ 'QMAKE_CFLAGS_RELEASE = $(CPPFLAGS) $(CFLAGS)' \
+ 'QMAKE_CXXFLAGS_RELEASE = $(CPPFLAGS) $(CXXFLAGS)' \
+ 'QMAKE_LFLAGS_RELEASE = $(LDFLAGS)'
clean::
- rm -f $(DEB_BUILDDIR)/Makefile $(DEB_BUILDDIR)/.qmake.internal.cache
+ rm -f \
+ $(DEB_BUILDDIR)/Makefile \
+ $(DEB_BUILDDIR)/.qmake.internal.cache
endif
diff --git a/1/class/scons.mk.in b/1/class/scons.mk.in
index 515c6e1..466a6ee 100644
--- a/1/class/scons.mk.in
+++ b/1/class/scons.mk.in
@@ -31,12 +31,17 @@ DEB_PHONY_RULES += scons-clean
common-build-arch common-build-indep:: debian/stamp-scons-build
debian/stamp-scons-build:
- $(DEB_SCONS_INVOKE) $(DEB_SCONS_BUILD_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_BUILD_OPTIONS)
+ $(DEB_SCONS_INVOKE) $(DEB_SCONS_BUILD_TARGET) \
+ $(DEB_SCONS_OPTIONS) \
+ $(DEB_SCONS_BUILD_OPTIONS)
touch debian/stamp-scons-build
clean:: scons-clean
scons-clean::
- $(DEB_SCONS_INVOKE) $(DEB_SCONS_CLEAN_TARGET) $(DEB_SCONS_OPTIONS) --keep-going --clean || true
+ $(DEB_SCONS_INVOKE) $(DEB_SCONS_CLEAN_TARGET) \
+ $(DEB_SCONS_OPTIONS) \
+ --keep-going --clean \
+ || true
rm -f debian/stamp-scons-build
rm -rf .sconf_temp/
rm -f .sconsign.dblite config.log
@@ -44,20 +49,26 @@ scons-clean::
common-install-arch common-install-indep:: common-install-impl
common-install-impl::
@if test -n "$(DEB_SCONS_INSTALL_TARGET)"; then \
- echo $(DEB_SCONS_INVOKE) $(DEB_SCONS_INSTALL_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_INSTALL_OPTIONS); \
- $(DEB_SCONS_INVOKE) $(DEB_SCONS_INSTALL_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_INSTALL_OPTIONS); \
+ echo $(DEB_SCONS_INVOKE) $(DEB_SCONS_INSTALL_TARGET) \
+ $(DEB_SCONS_OPTIONS) \
+ $(DEB_SCONS_INSTALL_OPTIONS); \
+ $(DEB_SCONS_INVOKE) $(DEB_SCONS_INSTALL_TARGET) \
+ $(DEB_SCONS_OPTIONS) \
+ $(DEB_SCONS_INSTALL_OPTIONS); \
else \
- echo "DEB_SCONS_INSTALL_TARGET unset, skipping default scons.mk common-install target"; \
+ echo "DEB_SCONS_INSTALL_TARGET unset, \
+ skipping default scons.mk common-install target"; \
fi
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
common-post-build-arch common-post-build-indep:: common-post-build-impl
common-post-build-impl::
@if test -n "$(DEB_SCONS_CHECK_TARGET)"; then \
- echo $(DEB_SCONS_INVOKE) $(DEB_SCONS_CHECK_TARGET); \
- $(DEB_SCONS_INVOKE) $(DEB_SCONS_CHECK_TARGET) $(DEB_SCONS_OPTIONS); \
+ echo $(DEB_SCONS_INVOKE) $(DEB_SCONS_CHECK_TARGET); \
+ $(DEB_SCONS_INVOKE) $(DEB_SCONS_CHECK_TARGET) \
+ $(DEB_SCONS_OPTIONS); \
else \
- echo "DEB_SCONS_CHECK_TARGET unset, not running checks"; \
+ echo "DEB_SCONS_CHECK_TARGET unset, not running checks"; \
fi
endif
diff --git a/1/class/waf.mk.in b/1/class/waf.mk.in
index f1ef75b..7afa7bd 100644
--- a/1/class/waf.mk.in
+++ b/1/class/waf.mk.in
@@ -100,23 +100,30 @@ cdbs-waf-checksum:
common-configure-arch common-configure-indep:: common-configure-impl
common-configure-impl:: debian/stamp-waf-configure
debian/stamp-waf-configure:
- $(cdbs_waf_configure_invoke) $(cdbs_waf_configure_target) --prefix=$(DEB_WAF_PREFIX) $(cdbs_waf_options) $(cdbs_waf_configure_options)
+ $(cdbs_waf_configure_invoke) $(cdbs_waf_configure_target) \
+ --prefix=$(DEB_WAF_PREFIX) \
+ $(cdbs_waf_options) \
+ $(cdbs_waf_configure_options)
touch $@
common-build-arch common-build-indep:: common-build-impl
common-build-impl:: debian/stamp-waf-build
debian/stamp-waf-build:
- $(cdbs_waf_invoke) $(cdbs_waf_build_target) $(cdbs_waf_options)
+ $(cdbs_waf_invoke) $(cdbs_waf_build_target) \
+ $(cdbs_waf_options)
touch $@
clean:: cdbs-waf-clean
cdbs-waf-clean:
- $(cdbs_waf_invoke) $(cdbs_waf_clean_target) $(cdbs_waf_options)
+ $(cdbs_waf_invoke) $(cdbs_waf_clean_target) \
+ $(cdbs_waf_options)
rm -rf debian/stamp-waf-*
common-install-arch common-install-indep:: common-install-impl
common-install-impl::
- $(cdbs_waf_invoke) $(cdbs_waf_install_target) --destdir=$(cdbs_curdestdir) $(cdbs_waf_options)
+ $(cdbs_waf_invoke) $(cdbs_waf_install_target) \
+ --destdir=$(cdbs_curdestdir) \
+ $(cdbs_waf_options)
CDBS_BUILD_DEPENDS_class_waf ?= python, cdbs (>= 0.4.90~)
CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_waf)
diff --git a/1/rules/buildcore.mk.in b/1/rules/buildcore.mk.in
index 2f16ffe..4f0053f 100644
--- a/1/rules/buildcore.mk.in
+++ b/1/rules/buildcore.mk.in
@@ -31,20 +31,26 @@ testroot:
# These targets are triggered by pre-build and clean targets allowing
# for non-intrusive sanity checks of the build environment
-$(patsubst %,testsanity/%,$(DEB_ALL_PACKAGES)) :: testsanity/% :
+$(patsubst %,testsanity/%,$(DEB_ALL_PACKAGES)) :: testsanity/% :
testsanity:: $(patsubst %,testsanity/%,$(DEB_ALL_PACKAGES))
-$(patsubst %,makebuilddir/%,$(DEB_ALL_PACKAGES)) :: makebuilddir/% :
- $(if $(DEB_BUILDDIR_$(cdbs_curpkg)),mkdir -p "$(DEB_BUILDDIR_$(cdbs_curpkg))")
+$(patsubst %,makebuilddir/%,$(DEB_ALL_PACKAGES)) :: makebuilddir/% :
+ $(if $(DEB_BUILDDIR_$(cdbs_curpkg)),\
+ mkdir -p "$(DEB_BUILDDIR_$(cdbs_curpkg))")
makebuilddir:: $(patsubst %,makebuilddir/%,$(DEB_ALL_PACKAGES))
mkdir -p "$(DEB_BUILDDIR)"
cleanbuilddir:: $(patsubst %,cleanbuilddir/%,$(DEB_ALL_PACKAGES))
- -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rmdir $(DEB_BUILDDIR))
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),\
+ ,\
+ rmdir $(DEB_BUILDDIR))
-$(patsubst %,cleanbuilddir/%,$(DEB_ALL_PACKAGES)) :: cleanbuilddir/% :
- -$(if $(DEB_BUILDDIR_$(cdbs_curpkg)),$(if $(call cdbs_streq,$(DEB_BUILDDIR_$(cdbs_curpkg)),$(DEB_SRCDIR)),,rmdir "$(DEB_BUILDDIR_$(cdbs_curpkg))"))
+$(patsubst %,cleanbuilddir/%,$(DEB_ALL_PACKAGES)) :: cleanbuilddir/% :
+ -$(if $(DEB_BUILDDIR_$(cdbs_curpkg)),\
+ $(if $(call cdbs_streq,$(DEB_BUILDDIR_$(cdbs_curpkg)),$(DEB_SRCDIR)),\
+ ,\
+ rmdir "$(DEB_BUILDDIR_$(cdbs_curpkg))"))
# This variable is used by tarball.mk, but we want it here in order to check
@@ -60,17 +66,34 @@ CDBS_BUILD_DEPENDS += $(if $(findstring .zip,$(DEB_TARBALL)),$(comma) $(CDBS_BUI
ifneq (, $(DEB_TARBALL))
$(call cdbs_info,\
parsing $(DEB_TARBALL) ...)
-config_all_tar := $(shell \
+config_all_tar := $(shell \
for i in $(DEB_TARBALL) ; do \
if ! test -e $$i.cdbs-config_list ; then \
echo Parsing $$i... >&2 ; \
case $$i in \
- *.tar$(close_parenthesis) tar -tf $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \
- *.tgz|*.tar.gz$(close_parenthesis) tar -tzf $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \
- *.tar.bz|*.tar.bz2$(close_parenthesis) tar -tjf $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \
- *.tar.lzma$(close_parenthesis) tar -t --lzma -f $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \
- *.zip$(close_parenthesis) unzip -l $$i | grep "/config\.[^/]*$$" > $$i.cdbs-config_list ;; \
- *$(close_parenthesis) echo Warning: tarball $$i with unknown format >&2 ;; \
+ *.tar$(close_parenthesis) \
+ tar -tf $$i \
+ | grep "/config\.[^/]*$$" \
+ > $$i.cdbs-config_list ;; \
+ *.tgz|*.tar.gz$(close_parenthesis) \
+ tar -tzf $$i \
+ | grep "/config\.[^/]*$$" \
+ > $$i.cdbs-config_list ;; \
+ *.tar.bz|*.tar.bz2$(close_parenthesis) \
+ tar -tjf $$i \
+ | grep "/config\.[^/]*$$" \
+ > $$i.cdbs-config_list ;; \
+ *.tar.lzma$(close_parenthesis) \
+ tar -t --lzma -f $$i \
+ | grep "/config\.[^/]*$$" \
+ > $$i.cdbs-config_list ;; \
+ *.zip$(close_parenthesis) \
+ unzip -l $$i \
+ | grep "/config\.[^/]*$$" \
+ > $$i.cdbs-config_list ;; \
+ *$(close_parenthesis) \
+ echo Warning: tarball $$i \
+ with unknown format >&2 ;; \
esac ; \
fi ; \
cat $$i.cdbs-config_list ; \
@@ -79,18 +102,18 @@ endif
# Avoid recursive braindamage if we're building autotools-dev
ifeq (, $(shell grep -xi 'Package: autotools-dev' debian/control))
-config_guess := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.guess)
-config_sub := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.sub)
+config_guess := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.guess)
+config_sub := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.sub)
ifneq (, $(config_all_tar))
-config_guess_tar := $(filter %/config.guess, $(config_all_tar))
-config_sub_tar := $(filter %/config.sub, $(config_all_tar))
+config_guess_tar := $(filter %/config.guess, $(config_all_tar))
+config_sub_tar := $(filter %/config.sub, $(config_all_tar))
endif
endif
# Ditto for gnulib
ifeq (, $(shell grep -xi 'Package: gnulib' debian/control))
-config_rpath := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.rpath)
+config_rpath := $(shell find $(DEB_SRCDIR) \( -type f -or -type l \) -name config.rpath)
ifneq (, $(config_all_tar))
-config_rpath_tar := $(filter %/config.rpath, $(config_all_tar))
+config_rpath_tar := $(filter %/config.rpath, $(config_all_tar))
endif
endif
@@ -121,7 +144,8 @@ ifneq (, $(config_guess))
for i in $(config_guess) ; do \
if ! test -e $$i.cdbs-orig ; then \
mv $$i $$i.cdbs-orig ; \
- cp --remove-destination /usr/share/misc/config.guess $$i ; \
+ cp --remove-destination \
+ /usr/share/misc/config.guess $$i ; \
fi ; \
done ; \
fi
@@ -131,7 +155,8 @@ ifneq (, $(config_sub))
for i in $(config_sub) ; do \
if ! test -e $$i.cdbs-orig ; then \
mv $$i $$i.cdbs-orig ; \
- cp --remove-destination /usr/share/misc/config.sub $$i ; \
+ cp --remove-destination \
+ /usr/share/misc/config.sub $$i ; \
fi ; \
done ; \
fi
@@ -141,7 +166,8 @@ ifneq (, $(config_rpath))
for i in $(config_rpath) ; do \
if ! test -e $$i.cdbs-orig ; then \
mv $$i $$i.cdbs-orig ; \
- cp --remove-destination /usr/share/gnulib/build-aux/config.rpath $$i ; \
+ cp --remove-destination \
+ /usr/share/gnulib/build-aux/config.rpath $$i ; \
fi ; \
done ; \
fi
@@ -176,8 +202,8 @@ $(patsubst %,build/%,$(DEB_INDEP_PACKAGES)) :: build/% : common-build-indep conf
# This rule is for stuff to run after the build process. Note that this
# may run under fakeroot or sudo, so it's inappropriate for things that
# should be run under the build target.
-common-post-build-arch:: common-build-arch $(patsubst %,build/%,$(DEB_ARCH_PACKAGES))
-common-post-build-indep:: common-build-indep $(patsubst %,build/%,$(DEB_INDEP_PACKAGES))
+common-post-build-arch:: common-build-arch $(patsubst %,build/%,$(DEB_ARCH_PACKAGES))
+common-post-build-indep:: common-build-indep $(patsubst %,build/%,$(DEB_INDEP_PACKAGES))
# Required Debian targets.
build-arch: $(patsubst %,build/%,$(DEB_ARCH_PACKAGES))
@@ -279,15 +305,60 @@ CDBS_ENHANCES_DEFAULT ?= $(CDBS_ENHANCES)
# Apply CDBS-declared dependencies to binary packages
$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
@echo 'Adding cdbs dependencies to debian/$(cdbs_curpkg).substvars'
- @echo '$(call cdbs_expand_curvar,CDBS_DEPENDS,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Depends=$$_\n"' >> debian/$(cdbs_curpkg).substvars
- @echo '$(call cdbs_expand_curvar,CDBS_PREDEPENDS,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Pre-Depends=$$_\n"' >> debian/$(cdbs_curpkg).substvars
- @echo '$(call cdbs_expand_curvar,CDBS_RECOMMENDS,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Recommends=$$_\n"' >> debian/$(cdbs_curpkg).substvars
- @echo '$(call cdbs_expand_curvar,CDBS_SUGGESTS,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Suggests=$$_\n"' >> debian/$(cdbs_curpkg).substvars
- @echo '$(call cdbs_expand_curvar,CDBS_BREAKS,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Breaks=$$_\n"' >> debian/$(cdbs_curpkg).substvars
- @echo '$(call cdbs_expand_curvar,CDBS_PROVIDES,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Provides=$$_\n"' >> debian/$(cdbs_curpkg).substvars
- @echo '$(call cdbs_expand_curvar,CDBS_REPLACES,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Replaces=$$_\n"' >> debian/$(cdbs_curpkg).substvars
- @echo '$(call cdbs_expand_curvar,CDBS_CONFLICTS,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Conflicts=$$_\n"' >> debian/$(cdbs_curpkg).substvars
- @echo '$(call cdbs_expand_curvar,CDBS_ENHANCES,$(comma) )' | perl -0 -ne '$(cdbs_re_squash_extended_space); $(re_squash_commas_and_spaces); /\w/ and print "cdbs:Enhances=$$_\n"' >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_DEPENDS,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Depends=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_PREDEPENDS,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Pre-Depends=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_RECOMMENDS,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Recommends=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_SUGGESTS,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Suggests=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_BREAKS,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Breaks=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_PROVIDES,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Provides=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_REPLACES,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Replaces=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_CONFLICTS,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Conflicts=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
+ @echo '$(call cdbs_expand_curvar,CDBS_ENHANCES,$(comma) )' \
+ | perl -0 -n \
+ -e '$(cdbs_re_squash_extended_space);' \
+ -e '$(re_squash_commas_and_spaces);' \
+ -e '/\w/ and print "cdbs:Enhances=$$_\n"' \
+ >> debian/$(cdbs_curpkg).substvars
# This rule is called after all packages are installed.
common-binary-arch:: testdir testroot $(patsubst %,install/%,$(DEB_ARCH_PACKAGES))
@@ -299,8 +370,8 @@ binary-arch: $(patsubst %,binary/%,$(DEB_ARCH_PACKAGES))
# These rules should do all the work of actually creating a .deb from the staging
# directory.
-$(patsubst %,binary/%,$(DEB_ARCH_PACKAGES)) :: binary/% : testdir testroot common-binary-arch install/%
-$(patsubst %,binary/%,$(DEB_INDEP_PACKAGES)) :: binary/% : testdir testroot common-binary-indep install/%
+$(patsubst %,binary/%,$(DEB_ARCH_PACKAGES)) :: binary/% : testdir testroot common-binary-arch install/%
+$(patsubst %,binary/%,$(DEB_INDEP_PACKAGES)) :: binary/% : testdir testroot common-binary-indep install/%
# Required Debian target
binary: binary-indep binary-arch
@@ -308,7 +379,7 @@ binary: binary-indep binary-arch
##
# Deprecated targets. You should use the -arch and -indep targets instead.
##
-common-configure:: common-configure-arch common-configure-indep
+common-configure:: common-configure-arch common-configure-indep
common-build:: common-build-arch common-build-indep
common-post-build:: common-post-build-arch common-post-build-indep
common-install-prehook:: common-install-prehook-arch common-install-prehook-indep
diff --git a/1/rules/debhelper.mk.in b/1/rules/debhelper.mk.in
index 7475a1e..ded76e5 100644
--- a/1/rules/debhelper.mk.in
+++ b/1/rules/debhelper.mk.in
@@ -64,7 +64,7 @@
# DEB_DH_MAKESHLIBS_ARGS_<package>
# Arguments passed directly to dh_makeshlibs, for a particular package <package>
# DEB_DH_MAKESHLIBS_ARGS
-# Completely override argument passing to dh_makeshlibs.
+# Completely override argument passing to dh_makeshlibs.
# DEB_DH_SHLIBDEPS_ARGS_ALL
# Arguments passed directly to dh_shlibdeps, for all packages
# DEB_DH_SHLIBDEPS_ARGS_<package>
@@ -192,7 +192,8 @@ common-install-prehook-impl::
dh_installdirs -A $(DEB_INSTALL_DIRS_ALL)
$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
- dh_installdirs -p$(cdbs_curpkg) $(or $(DEB_INSTALL_DIRS),$(DEB_INSTALL_DIRS_$(cdbs_curpkg)))
+ dh_installdirs -p$(cdbs_curpkg) \
+ $(or $(DEB_INSTALL_DIRS),$(DEB_INSTALL_DIRS_$(cdbs_curpkg)))
# Create .debs or .udebs as we see fit
$(patsubst %,binary/%,$(DEB_ALL_PACKAGES)) :: binary/% : binary-makedeb/%
@@ -206,31 +207,72 @@ $(patsubst %,binary/%,$(DEB_ALL_PACKAGES)) :: binary/% : binary-makedeb/%
# dh_install to split the source from debian/tmp, as well as installing
# ChangeLogs and the like.
$(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) :: binary-install/%:
- dh_installdocs -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_INSTALL_DOCS)
- dh_installexamples -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_INSTALL_EXAMPLES)
- dh_installman -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_INSTALL_MANPAGES)
- dh_installinfo -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_INSTALL_INFO)
- dh_installmenu -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALL_MENU_ARGS)
- dh_installcron -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALL_CRON_ARGS)
- dh_installinit -p$(cdbs_curpkg) $(if $(call cdbs_expand_curvar,DEB_UPDATE_RCD_PARAMS),--update-rcd-params="$(call cdbs_strip_quotes,$(call cdbs_expand_curvar,DEB_UPDATE_RCD_PARAMS))") $(call cdbs_expand_curvar,DEB_DH_INSTALLINIT_ARGS)
- dh_installdebconf -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLDEBCONF_ARGS)
- dh_installemacsen -p$(cdbs_curpkg) $(if $(DEB_EMACS_PRIORITY),--priority=$(DEB_EMACS_PRIORITY)) $(if $(DEB_EMACS_FLAVOR),--flavor=$(DEB_EMACS_FLAVOR)) $(call cdbs_expand_curvar,DEB_DH_INSTALLEMACSEN_ARGS)
- dh_installcatalogs -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLCATALOGS_ARGS)
- dh_installpam -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLPAM_ARGS)
- dh_installlogrotate -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLLOGROTATE_ARGS)
- dh_installlogcheck -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLLOGCHECK_ARGS)
- dh_installchangelogs -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLCHANGELOGS_ARGS) $(call cdbs_expand_curvar,DEB_INSTALL_CHANGELOGS)
- $(if $(wildcard /usr/bin/dh_installudev),dh_installudev -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLUDEV_ARGS))
- $(if $(wildcard /usr/bin/dh_lintian),dh_lintian -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_LINTIAN_ARGS))
- $(if $(wildcard /usr/bin/dh_bugfiles),dh_bugfiles -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_BUGFILES_ARGS))
- dh_install -p$(cdbs_curpkg) $(if $(DEB_DH_INSTALL_SOURCEDIR),--sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)) $(call cdbs_expand_curvar,DEB_DH_INSTALL_ARGS)
- $(if $(wildcard /usr/bin/dh_systemd_enable),dh_systemd_enable -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_SYSTEMD_ENABLE_ARGS))
- $(if $(wildcard /usr/bin/dh_systemd_start),dh_systemd_start -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_SYSTEMD_START_ARGS))
+ dh_installdocs -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_INSTALL_DOCS)
+ dh_installexamples -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_INSTALL_EXAMPLES)
+ dh_installman -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_INSTALL_MANPAGES)
+ dh_installinfo -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_INSTALL_INFO)
+ dh_installmenu -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALL_MENU_ARGS)
+ dh_installcron -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALL_CRON_ARGS)
+ dh_installinit -p$(cdbs_curpkg) \
+ $(if $(call cdbs_expand_curvar,DEB_UPDATE_RCD_PARAMS),\
+ --update-rcd-params="$(call cdbs_strip_quotes,$(call cdbs_expand_curvar,DEB_UPDATE_RCD_PARAMS))") \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLINIT_ARGS)
+ dh_installdebconf -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLDEBCONF_ARGS)
+ dh_installemacsen -p$(cdbs_curpkg) \
+ $(if $(DEB_EMACS_PRIORITY),\
+ --priority=$(DEB_EMACS_PRIORITY)) \
+ $(if $(DEB_EMACS_FLAVOR),\
+ --flavor=$(DEB_EMACS_FLAVOR)) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLEMACSEN_ARGS)
+ dh_installcatalogs -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLCATALOGS_ARGS)
+ dh_installpam -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLPAM_ARGS)
+ dh_installlogrotate -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLLOGROTATE_ARGS)
+ dh_installlogcheck -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLLOGCHECK_ARGS)
+ dh_installchangelogs -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLCHANGELOGS_ARGS) \
+ $(call cdbs_expand_curvar,DEB_INSTALL_CHANGELOGS)
+ $(if $(wildcard /usr/bin/dh_installudev),\
+ dh_installudev -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLUDEV_ARGS))
+ $(if $(wildcard /usr/bin/dh_lintian),\
+ dh_lintian -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_LINTIAN_ARGS))
+ $(if $(wildcard /usr/bin/dh_bugfiles),\
+ dh_bugfiles -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_BUGFILES_ARGS))
+ dh_install -p$(cdbs_curpkg) \
+ $(if $(DEB_DH_INSTALL_SOURCEDIR),\
+ --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALL_ARGS)
+ $(if $(wildcard /usr/bin/dh_systemd_enable),\
+ dh_systemd_enable -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_SYSTEMD_ENABLE_ARGS))
+ $(if $(wildcard /usr/bin/dh_systemd_start),\
+ dh_systemd_start -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_SYSTEMD_START_ARGS))
# TODO: Use DEB_DH_LINK_ARGS as package-default var (not global addon)
- dh_link -p$(cdbs_curpkg) $(DEB_DH_LINK_ARGS) $(DEB_DH_LINK_$(cdbs_curpkg))
- $(if $(wildcard /usr/bin/dh_buildinfo),dh_buildinfo -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_BUILDINFO_ARGS))
- dh_installmime -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLMIME_ARGS)
- $(if $(wildcard /usr/bin/dh_installgsettings),dh_installgsettings -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLGSETTINGS_ARGS))
+ dh_link -p$(cdbs_curpkg) \
+ $(DEB_DH_LINK_ARGS) \
+ $(DEB_DH_LINK_$(cdbs_curpkg))
+ $(if $(wildcard /usr/bin/dh_buildinfo),\
+ dh_buildinfo -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_BUILDINFO_ARGS))
+ dh_installmime -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLMIME_ARGS)
+ $(if $(wildcard /usr/bin/dh_installgsettings),\
+ dh_installgsettings -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLGSETTINGS_ARGS))
# This rule is called after all packages have been installed, and their
# post-install hooks have been run.
@@ -245,8 +287,12 @@ $(patsubst %,binary-post-install/%,$(DEB_ALL_PACKAGES)) :: binary-post-install/%
# to strip files.
$(patsubst %,binary-strip/%,$(DEB_ARCH_PACKAGES)) :: binary-strip/%: common-binary-post-install-arch binary-strip-IMPL/%
$(patsubst %,binary-strip/%,$(DEB_INDEP_PACKAGES)) :: binary-strip/%: common-binary-post-install-indep binary-strip-IMPL/%
-$(patsubst %,binary-strip-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-strip-IMPL/%:
- $(if $(is_debug_package),,dh_strip -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(call cdbs_expand_curvar,DEB_STRIP_EXCLUDE)) $(call cdbs_expand_curvar,DEB_DH_STRIP_ARGS))
+$(patsubst %,binary-strip-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-strip-IMPL/%:
+ $(if $(is_debug_package),\
+ ,\
+ dh_strip -p$(cdbs_curpkg) \
+ $(call cdbs_add_dashx,$(call cdbs_expand_curvar,DEB_STRIP_EXCLUDE)) \
+ $(call cdbs_expand_curvar,DEB_DH_STRIP_ARGS))
# This rule is called right before generating debs {post,pre}{inst,rm} and controls, deps, are calculated
# for each package, but after the binary-fixup hooks have been run.
@@ -257,10 +303,17 @@ common-binary-fixup-indep:: $(patsubst %,binary-fixup/%,$(DEB_INDEP_PACKAGES))
# This rule is called after stripping; it compresses, fixes permissions,
# and sets up shared library information.
$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
- dh_compress -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(call cdbs_expand_curvar,DEB_COMPRESS_EXCLUDE)) $(call cdbs_expand_curvar,DEB_DH_COMPRESS_ARGS)
- dh_fixperms -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(call cdbs_expand_curvar,DEB_FIXPERMS_EXCLUDE)) $(call cdbs_expand_curvar,DEB_DH_FIXPERMS_ARGS)
+ dh_compress -p$(cdbs_curpkg) \
+ $(call cdbs_add_dashx,$(call cdbs_expand_curvar,DEB_COMPRESS_EXCLUDE)) \
+ $(call cdbs_expand_curvar,DEB_DH_COMPRESS_ARGS)
+ dh_fixperms -p$(cdbs_curpkg) \
+ $(call cdbs_add_dashx,$(call cdbs_expand_curvar,DEB_FIXPERMS_EXCLUDE)) \
+ $(call cdbs_expand_curvar,DEB_DH_FIXPERMS_ARGS)
# TODO: Use DEB_DH_MAKESHLIBS_ARGS as package-default (not global override)
- $(if $(is_debug_package),,dh_makeshlibs -p$(cdbs_curpkg) $(DEB_DH_MAKESHLIBS_ARGS))
+ $(if $(is_debug_package),\
+ ,\
+ dh_makeshlibs -p$(cdbs_curpkg) \
+ $(DEB_DH_MAKESHLIBS_ARGS))
# This rule is called right before building the binary .deb packages
# for each package, but after the binary-predeb hooks have been run.
@@ -268,25 +321,33 @@ common-binary-predeb-arch:: $(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES))
common-binary-predeb-indep:: $(patsubst %,binary-predeb/%,$(DEB_INDEP_PACKAGES))
# This rule is called right before a packages' .deb file is made.
-# It is a good place to make programs setuid, change the scripts in DEBIAN/, etc.
+# It is a good place to make programs setuid, change the scripts in DEBIAN/, etc.
$(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES)) :: binary-predeb/%: common-binary-fixup-arch binary-predeb-IMPL/%
$(patsubst %,binary-predeb/%,$(DEB_INDEP_PACKAGES)) :: binary-predeb/%: common-binary-fixup-indep binary-predeb-IMPL/%
$(patsubst %,binary-predeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-predeb-IMPL/%:
- dh_installdeb -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLDEB_ARGS)
- dh_perl -p$(cdbs_curpkg) $(DEB_DH_PERL_ARGS)
+ dh_installdeb -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_INSTALLDEB_ARGS)
+ dh_perl -p$(cdbs_curpkg) \
+ $(DEB_DH_PERL_ARGS)
# TODO: Use DEB_DH_SHLIBDEPS_ARGS as package-default (not global override)
- dh_shlibdeps -p$(cdbs_curpkg) $(DEB_DH_SHLIBDEPS_ARGS)
- $(if $(wildcard /usr/bin/dh_girepository),dh_girepository -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_GIREPOSITORY_ARGS))
+ dh_shlibdeps -p$(cdbs_curpkg) \
+ $(DEB_DH_SHLIBDEPS_ARGS)
+ $(if $(wildcard /usr/bin/dh_girepository),\
+ dh_girepository -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_GIREPOSITORY_ARGS))
# This rule is called to create a package. Generally it's not going to be
# useful to hook things onto this rule.
$(patsubst %,binary-makedeb/%,$(DEB_ARCH_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-arch binary-makedeb-IMPL/%
$(patsubst %,binary-makedeb/%,$(DEB_INDEP_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-indep binary-makedeb-IMPL/%
-$(patsubst %,binary-makedeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-makedeb-IMPL/% :
+$(patsubst %,binary-makedeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-makedeb-IMPL/% :
# TODO: Use DEB_DH_GENCONTROL_ARGS as package-default (not global override)
- dh_gencontrol -p$(cdbs_curpkg) $(DEB_DH_GENCONTROL_ARGS)
- dh_md5sums -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_MD5SUMS_ARGS)
- $(DEB_DH_BUILDDEB_ENV) dh_builddeb -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_BUILDDEB_ARGS)
+ dh_gencontrol -p$(cdbs_curpkg) \
+ $(DEB_DH_GENCONTROL_ARGS)
+ dh_md5sums -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_MD5SUMS_ARGS)
+ $(DEB_DH_BUILDDEB_ENV) dh_builddeb -p$(cdbs_curpkg) \
+ $(call cdbs_expand_curvar,DEB_DH_BUILDDEB_ARGS)
## Deprecated
common-binary-post-install:: common-binary-post-install-arch common-binary-post-install-indep
diff --git a/1/rules/dpatch.mk.in b/1/rules/dpatch.mk.in
index 37f5b43..c4c33d7 100644
--- a/1/rules/dpatch.mk.in
+++ b/1/rules/dpatch.mk.in
@@ -40,7 +40,7 @@ CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_rules_dpatch)
_cdbs_dpatch_apply_rule = apply-dpatches
_cdbs_dpatch_unapply_rule = deapply-dpatches
-DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .patch .patch.gz .patch.bz2
+DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .patch .patch.gz .patch.bz2
DEB_PATCHDIRS ?= debian/patches
close_parenthesis ?= )
# FIXME: Restructure to allow early override (or lowercase the variable!)
@@ -90,7 +90,7 @@ deapply-dpatches:
patch: apply-dpatches
unpatch: deapply-dpatches
-# The patch subsystem
+# The patch subsystem
apply-dpatches: pre-build debian/stamp-patched
debian/stamp-patched:
$(MAKE) -f debian/rules reverse-config
diff --git a/1/rules/simple-patchsys.mk.in b/1/rules/simple-patchsys.mk.in
index 947e52b..1a4b3da 100644
--- a/1/rules/simple-patchsys.mk.in
+++ b/1/rules/simple-patchsys.mk.in
@@ -81,7 +81,7 @@ cdbs_update_stamp = if [ "$@" = "debian/stamp-patched" ]; then touch $(1); elif
cdbs_patch_stamp_file = debian/stamp-patch-$$(echo $$patch | tr '/' '=')
-# The patch subsystem
+# The patch subsystem
apply-patches: pre-build debian/stamp-patched
debian/stamp-patched: $(DEB_PATCHES)
debian/stamp-patched reverse-patches:
@@ -92,7 +92,7 @@ debian/stamp-patched reverse-patches:
@echo "patches: $(DEB_PATCHES)"
@set -e ; reverse=""; patches="$(DEB_PATCHES)"; \
if [ "$@" = "reverse-patches" ]; then \
- reverse="-R"; \
+ reverse="-R"; \
for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \
patches="$$reversepatches"; \
fi; \
diff --git a/1/rules/upstream-tarball.mk.in b/1/rules/upstream-tarball.mk.in
index 77dc77c..c2502cc 100644
--- a/1/rules/upstream-tarball.mk.in
+++ b/1/rules/upstream-tarball.mk.in
@@ -23,7 +23,7 @@ _cdbs_rules_upstream_tarball = 1
include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
# Prefix for upstream location of all upstream tarballs (mandatory!)
-#DEB_UPSTREAM_URL =
+#DEB_UPSTREAM_URL =
DEB_UPSTREAM_PACKAGE ?= $(DEB_SOURCE_PACKAGE)
DEB_UPSTREAM_TARBALL_VERSION ?= $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDES)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)=),$(DEB_UPSTREAM_VERSION))
@@ -32,7 +32,7 @@ DEB_UPSTREAM_TARBALL_EXTENSION ?= tar.gz
# Checksum to ensure integrity of downloadeds using get-orig-source (optional)
# TODO: somehow support (auto-downloadable?) file containing checksums
-#DEB_UPSTREAM_TARBALL_MD5 =
+#DEB_UPSTREAM_TARBALL_MD5 =
DEB_UPSTREAM_WORKDIR ?= ../tarballs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/cdbs.git
More information about the Reproducible-commits
mailing list