This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch sid in repository glibc.
commit c66e552f4345d8559c68f990eb77ef71e0a288e3 Author: Aurelien Jarno <aurel...@aurel32.net> Date: Mon Oct 17 10:37:38 2016 +0200 debian/sysdeps/linux.mk: fix cross-compilation by also looking at headers in $(LINUX_HEADERS). --- debian/changelog | 3 ++- debian/sysdeps/linux.mk | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6a5d33..94638df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ glibc (2.24-5) UNRELEASED; urgency=medium [ Aurelien Jarno ] - * + * debian/sysdeps/linux.mk: fix cross-compilation by also looking at headers + in $(LINUX_HEADERS). [ Samuel Thibault ] * hurd-i386/cvs-libpthread-static-weak.diff: New patch to fix weak diff --git a/debian/sysdeps/linux.mk b/debian/sysdeps/linux.mk index 49a45d5..03360fe 100644 --- a/debian/sysdeps/linux.mk +++ b/debian/sysdeps/linux.mk @@ -20,7 +20,6 @@ ifndef LINUX_SOURCE else LINUX_HEADERS := /usr/$(DEB_HOST_GNU_TYPE)/include endif - LINUX_ARCH_HEADERS := /usr/include/$(DEB_HOST_MULTIARCH) else LINUX_HEADERS := $(LINUX_SOURCE)/include endif @@ -36,7 +35,9 @@ $(stamp)mkincludedir: # Kernel and library headers for h in arch asm asm-generic libaudit.h linux selinux sys/capability.h ; do \ mkdir -p debian/include/$$(dirname $$h) ; \ - if [ -e "/usr/include/$(DEB_HOST_MULTIARCH)/$$h" ]; then \ + if [ -e "$(LINUX_HEADERS)/$$h" ]; then \ + ln -s $(LINUX_HEADERS)/$$h debian/include/$$h ; \ + elif [ -e "/usr/include/$(DEB_HOST_MULTIARCH)/$$h" ]; then \ ln -s /usr/include/$(DEB_HOST_MULTIARCH)/$$h debian/include/$$h ; \ elif [ -e "/usr/include/$$h" ]; then \ ln -s /usr/include/$$h debian/include/$$h ; \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git