[glibc] 01/01: debian/rules.d/control.mk: Populate Testsuite-Triggers with toolchain.
This is an automated email from the git hooks/post-receive script.
adconrad pushed a commit to branch glibc-2.24
in repository glibc.
commit 925a34a398bd5ece03de49ce344bbb2b63a19726
Author: Adam Conrad <adconrad@0c3.net>
Date: Tue Aug 16 05:41:50 2016 -0600
debian/rules.d/control.mk: Populate Testsuite-Triggers with toolchain.
debian/rules.d/control.mk: Manually add binutils, linux-libc-dev, and the
current GCC to the rebuild test deps, so they land in Testsuite-Triggers.
---
debian/changelog | 7 +++++++
debian/rules.d/control.mk | 6 +++++-
debian/tests/control | 2 +-
debian/tests/control.in | 3 +++
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1ae7ff0..0421a08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+glibc (2.24-0experimental2) UNRELEASED; urgency=medium
+
+ * debian/rules.d/control.mk: Manually add binutils, linux-libc-dev, and the
+ current GCC to the rebuild test deps, so they land in Testsuite-Triggers.
+
+ -- Adam Conrad <adconrad@0c3.net> Tue, 16 Aug 2016 05:33:48 -0600
+
glibc (2.24-0experimental1) experimental; urgency=medium
[ Samuel Thibault ]
diff --git a/debian/rules.d/control.mk b/debian/rules.d/control.mk
index 412192f..1222f10 100644
--- a/debian/rules.d/control.mk
+++ b/debian/rules.d/control.mk
@@ -5,6 +5,7 @@ libc6_archs := amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mips
libc6_1_archs := alpha
control_deps := $(wildcard debian/control.in/*) $(addprefix debian/control.in/, $(libc_packages))
+triggers := binutils, linux-libc-dev [linux-any], $(BASE_CC)$(DEB_GCC_VERSION)
$(patsubst %,debian/control.in/%,$(libc_packages)) :: debian/control.in/% : debian/control.in/libc debian/rules.d/control.mk
sed -e "s%@libc@%$*%g" \
@@ -13,7 +14,7 @@ $(patsubst %,debian/control.in/%,$(libc_packages)) :: debian/control.in/% : debi
< $< > $@
debian/control: $(stamp)control
-$(stamp)control: debian/rules.d/control.mk $(control_deps)
+$(stamp)control: debian/rules.d/control.mk $(control_deps) debian/tests/control.in
# Check that all files end with a new line
set -e ; for i in debian/control.in/* ; do \
@@ -42,4 +43,7 @@ $(stamp)control: debian/rules.d/control.mk $(control_deps)
cat debian/control.in/opt >> $@T
sed -e 's%@libc@%$(libc)%g' -e 's%@GLIBC_VERSION@%$(GLIBC_VERSION)%g' < $@T > debian/control
rm $@T
+
+ # And generate the tests control file with the current GCC
+ sed -e 's%@triggers@%$(triggers)%g' debian/tests/control.in > debian/tests/control
touch $@
diff --git a/debian/tests/control b/debian/tests/control
index 072702e..fe692c3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
Tests: rebuild
-Depends: @builddeps@, fakeroot
+Depends: @builddeps@, fakeroot, binutils, linux-libc-dev [linux-any], gcc-6
Restrictions: allow-stderr
diff --git a/debian/tests/control.in b/debian/tests/control.in
new file mode 100644
index 0000000..20ac0b5
--- /dev/null
+++ b/debian/tests/control.in
@@ -0,0 +1,3 @@
+Tests: rebuild
+Depends: @builddeps@, fakeroot, @triggers@
+Restrictions: allow-stderr
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: