[glibc] 01/02: debian/sysdeps/linux.mk: Install both kernel and library headers symlinks using a singlee for loop.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit f72643c1eeb2496024002213fa9eedb49e33c167
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Oct 15 21:00:53 2016 +0200
debian/sysdeps/linux.mk: Install both kernel and library headers symlinks using a singlee for loop.
---
debian/changelog | 4 ++++
debian/sysdeps/linux.mk | 19 +++++--------------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d8e1d53..ad47c62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,10 @@ glibc (2.24-4) UNRELEASED; urgency=medium
* debian/patches/hppa/cvs-atomic-machine.diff: New patch from upstream to
fix nptl/tst-stack4 on hppa. Closes: #838574.
+ [ Aurelien Jarno ]
+ * debian/sysdeps/linux.mk: Install both kernel and library headers symlinks
+ using a singlee for loop.
+
-- Aurelien Jarno <aurel32@debian.org> Sat, 17 Sep 2016 20:03:04 +0200
glibc (2.24-3) unstable; urgency=medium
diff --git a/debian/sysdeps/linux.mk b/debian/sysdeps/linux.mk
index 7e9fda8..fd0ef78 100644
--- a/debian/sysdeps/linux.mk
+++ b/debian/sysdeps/linux.mk
@@ -33,22 +33,13 @@ $(stamp)mkincludedir:
rm -rf debian/include
mkdir debian/include
- # Kernel headers
- if [ -d "$(LINUX_ARCH_HEADERS)/asm" ]; then \
- ln -s $(LINUX_ARCH_HEADERS)/asm debian/include ; \
- else \
- ln -s $(LINUX_HEADERS)/asm debian/include ; \
- fi
- ln -s $(LINUX_HEADERS)/asm-generic debian/include
- ln -s $(LINUX_HEADERS)/linux debian/include
-
- # Library headers
- for h in libaudit.h selinux sys/capability.h ; do \
+ # Kernel and library headers
+ for h in asm asm-generic libaudit.h linux selinux sys/capability.h ; do \
mkdir -p debian/include/$$(dirname $$h) ; \
- if [ -d "/usr/include/$(DEB_HOST_MULTIARCH)/$$h" ]; then \
+ if [ -e "/usr/include/$(DEB_HOST_MULTIARCH)/$$h" ]; then \
ln -s /usr/include/$(DEB_HOST_MULTIARCH)/$$h debian/include/$$h ; \
- else \
- ln -s /usr/include/$$h debian/include/$$h ; \
+ elif [ -e "/usr/include/$$h" ]; then \
+ ln -s /usr/include/$$h debian/include/$$h ; \
fi ; \
done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: