Your message dated Mon, 31 Jul 2017 17:11:10 +0200
with message-id <20170731151110.uyhot54n63np3...@aurel32.net>
and subject line Bug#845544: allow to inject linux-libc-dev dependency for
cross-toolchain-base builds
has caused the Debian Bug report #845544,
regarding allow to inject linux-libc-dev dependency for cross-toolchain-base
builds
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
845544: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=845544
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: src:glibc
Version: 2.24-6
Tags: patch
cross-toolchain-base builds both linux-libc-dev and libc-dev packages at the
same time, without having an linux-libc-dev installed. just allow to inject that
dependency by the build environment. It's better than having a local patch in
the cross-toolchain-base package which can fail to apply with further updates.
diff -Nru glibc-2.24/debian/changelog glibc-2.24/debian/changelog
--- glibc-2.24/debian/changelog 2016-11-21 18:22:48.000000000 +0000
+++ glibc-2.24/debian/changelog 2016-11-24 11:19:24.000000000 +0000
@@ -1,3 +1,10 @@
+glibc (2.24-6.1) UNRELEASED; urgency=medium
+
+ * Allow to inject the libc-dev dependency on linux-libc-dev by the build
+ environment.
+
+ -- Matthias Klose <d...@debian.org> Thu, 24 Nov 2016 12:19:24 +0100
+
glibc (2.24-6) unstable; urgency=medium
[ Samuel Thibault ]
diff -Nru glibc-2.24/debian/rules.d/debhelper.mk glibc-2.24/debian/rules.d/debhelper.mk
--- glibc-2.24/debian/rules.d/debhelper.mk 2016-11-21 18:22:01.000000000 +0000
+++ glibc-2.24/debian/rules.d/debhelper.mk 2016-11-24 11:19:21.000000000 +0000
@@ -160,7 +160,14 @@
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 \
--- End Message ---
--- Begin Message ---
Version: 2.24-7
On 2016-11-24 14:06, Matthias Klose wrote:
> Package: src:glibc
> Version: 2.24-6
> Tags: patch
>
> cross-toolchain-base builds both linux-libc-dev and libc-dev packages at the
> same time, without having an linux-libc-dev installed. just allow to inject
> that
> dependency by the build environment. It's better than having a local patch in
> the cross-toolchain-base package which can fail to apply with further updates.
>
This has been merged in version 2.24-7, but the bug hasn't been closed.
Doing so now.
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net
--- End Message ---
