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=ce5af1eeb795c6fa8ce122b801930ccd7adc8516 commit ce5af1eeb795c6fa8ce122b801930ccd7adc8516 Author: Guillem Jover <guil...@debian.org> AuthorDate: Sun Jul 18 05:31:49 2021 +0200 Dpkg::BuildFlags: Add support for ASFLAGS This environment variable holds the assembler flags. Ref: https://salsa.debian.org/debian/debhelper/-/merge_requests/50 --- man/dpkg-buildflags.pod | 4 ++++ scripts/Dpkg/Build/Info.pm | 4 ++-- scripts/Dpkg/BuildFlags.pm | 3 +++ scripts/mk/buildflags.mk | 3 ++- scripts/t/Dpkg_Build_Info.t | 2 +- scripts/t/mk/buildflags.mk | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/man/dpkg-buildflags.pod b/man/dpkg-buildflags.pod index 8af1d221b..7e5252d18 100644 --- a/man/dpkg-buildflags.pod +++ b/man/dpkg-buildflags.pod @@ -240,6 +240,10 @@ Show the version and exit. =over +=item B<ASFLAGS> + +Options for the assembler. Default value: empty. Since dpkg 1.21.0. + =item B<CFLAGS> Options for the C compiler. The default value set by the vendor diff --git a/scripts/Dpkg/Build/Info.pm b/scripts/Dpkg/Build/Info.pm index 13d244366..e0f26f9ed 100644 --- a/scripts/Dpkg/Build/Info.pm +++ b/scripts/Dpkg/Build/Info.pm @@ -52,8 +52,8 @@ my @env_allowed = ( # Toolchain. qw(CC CPP CXX OBJC OBJCXX PC FC M2C AS LD AR RANLIB MAKE AWK LEX YACC), # Toolchain flags. - qw(CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS GCJFLAGS DFLAGS FFLAGS - LDFLAGS ARFLAGS MAKEFLAGS), + qw(ASFLAGS CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS GCJFLAGS DFLAGS + FFLAGS LDFLAGS ARFLAGS MAKEFLAGS), # Dynamic linker, see ld(1). qw(LD_LIBRARY_PATH), # Locale, see locale(1). diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm index 1ac6757ae..f81f6b2de 100644 --- a/scripts/Dpkg/BuildFlags.pm +++ b/scripts/Dpkg/BuildFlags.pm @@ -70,6 +70,7 @@ sub load_vendor_defaults { $self->{features} = {}; $self->{flags} = { + ASFLAGS => '', CPPFLAGS => '', CFLAGS => '', CXXFLAGS => '', @@ -82,6 +83,7 @@ sub load_vendor_defaults { LDFLAGS => '', }; $self->{origin} = { + ASFLAGS => 'vendor', CPPFLAGS => 'vendor', CFLAGS => 'vendor', CXXFLAGS => 'vendor', @@ -94,6 +96,7 @@ sub load_vendor_defaults { LDFLAGS => 'vendor', }; $self->{maintainer} = { + ASFLAGS => 0, CPPFLAGS => 0, CFLAGS => 0, CXXFLAGS => 0, diff --git a/scripts/mk/buildflags.mk b/scripts/mk/buildflags.mk index cfeabda4f..ac7ad0211 100644 --- a/scripts/mk/buildflags.mk +++ b/scripts/mk/buildflags.mk @@ -1,5 +1,6 @@ # This Makefile fragment (since dpkg 1.16.1) defines the following variables: # +# ASFLAGS: flags for the assembler (since 1.21.0). # CFLAGS: flags for the C compiler. # CPPFLAGS: flags for the C preprocessor. # CXXFLAGS: flags for the C++ compiler. @@ -19,7 +20,7 @@ dpkg_lazy_eval ?= $$(or $$(value DPKG_CACHE_$(1)),$$(eval DPKG_CACHE_$(1) := $$(shell $(2)))$$(value DPKG_CACHE_$(1))) -DPKG_BUILDFLAGS_LIST = CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS \ +DPKG_BUILDFLAGS_LIST = ASFLAGS CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS \ GCJFLAGS DFLAGS FFLAGS FCFLAGS LDFLAGS define dpkg_buildflags_export_envvar diff --git a/scripts/t/Dpkg_Build_Info.t b/scripts/t/Dpkg_Build_Info.t index 958e00680..fe47da0de 100644 --- a/scripts/t/Dpkg_Build_Info.t +++ b/scripts/t/Dpkg_Build_Info.t @@ -22,7 +22,7 @@ BEGIN { use_ok('Dpkg::Build::Info'); } -is(scalar Dpkg::Build::Info::get_build_env_allowed(), 51, +is(scalar Dpkg::Build::Info::get_build_env_allowed(), 52, 'allowed environment variables array'); 1; diff --git a/scripts/t/mk/buildflags.mk b/scripts/t/mk/buildflags.mk index 90274ef90..542bced43 100644 --- a/scripts/t/mk/buildflags.mk +++ b/scripts/t/mk/buildflags.mk @@ -3,6 +3,7 @@ DEB_CPPFLAGS_MAINT_APPEND = -DTEST_MK=test include $(srcdir)/mk/buildflags.mk test: + test "$(ASFLAGS)" = "$(TEST_ASFLAGS)" test "$(CFLAGS)" = "$(TEST_CFLAGS)" test "$(CPPFLAGS)" = "$(TEST_CPPFLAGS) -DTEST_MK=test" test "$(CXXFLAGS)" = "$(TEST_CXXFLAGS)" -- Dpkg.Org's dpkg
