[glibc] 01/01: debian/rules.d/build.mk: add /usr/local multi-arch paths to ld.so.conf files. Closes: #685519, #771934.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit bcd8721c2285d336d2d4cd4901242e39404e8be2
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Dec 10 16:47:15 2017 +0100
debian/rules.d/build.mk: add /usr/local multi-arch paths to ld.so.conf files. Closes: #685519, #771934.
---
debian/changelog | 2 ++
debian/rules.d/build.mk | 2 ++
2 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 59bdeec..9d715ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ glibc (2.25-4) UNRELEASED; urgency=medium
libc6-dbg. Only fill it with files from the main libc and optimized
flavours. Other debugging symbols are available in the dbgsym packages.
Closes: #520680.
+ * debian/rules.d/build.mk: add /usr/local multi-arch paths to ld.so.conf
+ files. Closes: #685519, #771934.
-- Aurelien Jarno <aurel32@debian.org> Sat, 02 Dec 2017 13:13:06 +0100
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index f374bf2..4daf052 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -232,9 +232,11 @@ endif
mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$(DEB_HOST_MULTIARCH).conf"; \
echo "# Multiarch support" > $$conffile; \
+ echo "/usr/local/lib/$(DEB_HOST_MULTIARCH)" >> $$conffile; \
echo "$(call xx,slibdir)" >> $$conffile; \
echo "$(call xx,libdir)" >> $$conffile; \
if [ "$(DEB_HOST_GNU_TYPE)" != "$(DEB_HOST_MULTIARCH)" ]; then \
+ echo "/usr/local/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \
echo "/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \
echo "/usr/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \
fi; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: