[glibc] 02/02: rules.d/build.mk: test for DEB_BUILD_OPTIONS="nocheck" using filter instead of findstring.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.24
in repository glibc.
commit 8626bb5908a59a720fe3a7cb3598232393d8d6eb
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Aug 14 17:59:06 2016 +0200
rules.d/build.mk: test for DEB_BUILD_OPTIONS="nocheck" using filter instead of findstring.
---
debian/changelog | 2 ++
debian/rules.d/build.mk | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 7842fe4..823cc2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ glibc (2.24-0experimental1) UNRELEASED; urgency=medium
categories, use the copy directive when possible.
* debian/rules.d/build.mk: disable the C++ compiler when tests are disabled,
based on a patch from Matthias Klose. Closes: #834138.
+ * rules.d/build.mk: test for DEB_BUILD_OPTIONS="nocheck" using filter
+ instead of findstring.
-- Samuel Thibault <sthibault@debian.org> Thu, 04 Aug 2016 09:20:04 +0200
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index e1ec58d..e285446 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -113,7 +113,7 @@ endif
$(patsubst %,check_%,$(GLIBC_PASSES)) :: check_% : $(stamp)check_%
$(stamp)check_%: $(stamp)build_%
@set -e ; \
- if [ -n "$(findstring nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
+ if [ -n "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
echo "Tests have been disabled via DEB_BUILD_OPTIONS." ; \
elif [ $(call xx,configure_build) != $(call xx,configure_target) ] && \
! $(DEB_BUILDDIR)/elf/ld.so $(DEB_BUILDDIR)/libc.so >/dev/null 2>&1 ; then \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: