[glibc] 01/02: Allow to inject the libc-dev dependency on linux-libc-dev by the build environment.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 2ecb4a559a697ba1aa52e308d3b1791ad8485a47
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri Nov 25 23:09:24 2016 +0100
Allow to inject the libc-dev dependency on linux-libc-dev by the build environment.
---
debian/changelog | 4 ++++
debian/rules.d/debhelper.mk | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 39347f6..3c1f7e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ glibc (2.24-7) UNRELEASED; urgency=medium
* debian/patches/git-updates.diff: update from upstream stable branch.
* debian/rules: build with -no-pie -fno-PIE. Closes: #845512, #845521.
+ [ Matthias Klose ]
+ * Allow to inject the libc-dev dependency on linux-libc-dev by the build
+ environment.
+
-- Aurelien Jarno <aurel32@debian.org> Mon, 21 Nov 2016 19:24:59 +0100
glibc (2.24-6) unstable; urgency=medium
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index c6889ac..c2df89f 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -160,7 +160,14 @@ ifeq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
echo 'libgcc:Depends=libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]' >> tmp.substvars
endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
- echo "libc-dev:Depends=$$(dpkg-query -f '$${binary:Package} (>= $${Version}) ' -W linux-libc-dev:$(DEB_HOST_ARCH) | sed -e 's/:\S\+//')" >> tmp.substvars
+ # cross-toolchain-base builds both linux-libc-dev and libc-dev package in one step,
+ # not using an installed linux-libc-dev package. Injecting the dependency by the env.
+ if [ -n "$$CTB_LIBC_DEV_DEPENDS" ]; then \
+ depends=$$CTB_LIBC_DEV_DEPENDS; \
+ else \
+ depends=$$(dpkg-query -f '$${binary:Package} (>= $${Version}) ' -W linux-libc-dev:$(DEB_HOST_ARCH) | sed -e 's/:\S\+//'); \
+ fi; \
+ echo "libc-dev:Depends=$$depends" >> tmp.substvars
endif
for pkg in $(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES) $(DEB_UDEB_PACKAGES); do \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: