This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=9a0337de82f432c9bb4c75e279afd8dfaae93a3e commit 9a0337de82f432c9bb4c75e279afd8dfaae93a3e Author: Nicolas Boulenguez <[email protected]> AuthorDate: Fri Mar 11 04:30:19 2022 +0100 scripts/mk: Indent code in Makefile fragments [[email protected]: - Fix indentation also in buildflags.mk. - Keep exporting variables on per line. ] Signed-off-by: Guillem Jover <[email protected]> --- scripts/mk/buildflags.mk | 6 +++--- scripts/mk/buildtools.mk | 40 ++++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/scripts/mk/buildflags.mk b/scripts/mk/buildflags.mk index 9c2a27169..9cef0c0c4 100644 --- a/scripts/mk/buildflags.mk +++ b/scripts/mk/buildflags.mk @@ -24,9 +24,9 @@ DPKG_BUILDFLAGS_LIST = ASFLAGS CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS \ GCJFLAGS DFLAGS FFLAGS FCFLAGS LDFLAGS define dpkg_buildflags_export_envvar -ifdef $(1) -DPKG_BUILDFLAGS_EXPORT_ENVVAR += $(1)="$$(value $(1))" -endif + ifdef $(1) + DPKG_BUILDFLAGS_EXPORT_ENVVAR += $(1)="$$(value $(1))" + endif endef $(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_OPTIONS)) diff --git a/scripts/mk/buildtools.mk b/scripts/mk/buildtools.mk index 8873c2c2e..ea5082935 100644 --- a/scripts/mk/buildtools.mk +++ b/scripts/mk/buildtools.mk @@ -34,28 +34,28 @@ include $(dpkg_datadir)/architecture.mk # not defined or contain the make built-in defaults. On native builds if # TOOL is defined and TOOL_FOR_BUILD is not, we fallback to use TOOL. define dpkg_buildtool_setvar -ifeq (,$(findstring $(3),$(DEB_BUILD_OPTIONS))) -ifeq ($(origin $(1)),default) -$(1) = $(DEB_HOST_GNU_TYPE)-$(2) -else -$(1) ?= $(DEB_HOST_GNU_TYPE)-$(2) -endif + ifeq (,$(findstring $(3),$(DEB_BUILD_OPTIONS))) + ifeq ($(origin $(1)),default) + $(1) = $(DEB_HOST_GNU_TYPE)-$(2) + else + $(1) ?= $(DEB_HOST_GNU_TYPE)-$(2) + endif -# On native build fallback to use TOOL if that's defined. -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -$(1)_FOR_BUILD ?= $$($(1)) -else -$(1)_FOR_BUILD ?= $(DEB_BUILD_GNU_TYPE)-$(2) -endif -else -$(1) = : -$(1)_FOR_BUILD = : -endif + # On native build fallback to use TOOL if that's defined. + ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + $(1)_FOR_BUILD ?= $$($(1)) + else + $(1)_FOR_BUILD ?= $(DEB_BUILD_GNU_TYPE)-$(2) + endif + else + $(1) = : + $(1)_FOR_BUILD = : + endif -ifdef DPKG_EXPORT_BUILDTOOLS -export $(1) -export $(1)_FOR_BUILD -endif + ifdef DPKG_EXPORT_BUILDTOOLS + export $(1) + export $(1)_FOR_BUILD + endif endef $(eval $(call dpkg_buildtool_setvar,AS,as)) -- Dpkg.Org's dpkg
