[glibc] 01/01: hurd-i386/tg-gsync-libc.diff: Fix linking against built libmachuser
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit 020407b9033ed9e5af7eacec3f07b5c57c5dabb8
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Jan 2 17:56:33 2017 +0100
hurd-i386/tg-gsync-libc.diff: Fix linking against built libmachuser
instead of installed libmachuser
---
debian/changelog | 2 ++
debian/patches/hurd-i386/tg-gsync-libc.diff | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c517285..107d099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ glibc (2.24-9) UNRELEASED; urgency=medium
* hurd-i386/tg-magic-pid.diff: New patch, add support for /proc/self.
* hurd-i386/tg-mlockall.diff: New patch, add support for mlockall.
- control: Bump gnumach-dev build-depend accordingly.
+ * hurd-i386/tg-gsync-libc.diff: Fix linking against built libmachuser
+ instead of installed libmachuser.
[ Aurelien Jarno ]
* debian/sysdeps/{amd64,i386,x32}.mk: disable lock elision (aka Intel TSX)
diff --git a/debian/patches/hurd-i386/tg-gsync-libc.diff b/debian/patches/hurd-i386/tg-gsync-libc.diff
index d316842..3c24049 100644
--- a/debian/patches/hurd-i386/tg-gsync-libc.diff
+++ b/debian/patches/hurd-i386/tg-gsync-libc.diff
@@ -811,21 +811,21 @@ Index: glibc-2.23/sysdeps/mach/Makefile
endif
+ifeq (crypt,$(subdir))
-+ LDLIBS-crypt.so += -lmachuser
++ LDLIBS-crypt.so += $(objdir)/mach/libmachuser.so
+else ifeq (dlfcn,$(subdir))
-+ LDLIBS-dl.so += -lmachuser
++ LDLIBS-dl.so += $(objdir)/mach/libmachuser.so
+else ifeq (nis,$(subdir))
-+ LDLIBS-nsl.so += -lmachuser
-+ LDLIBS-nss_nis.so += -lmachuser
-+ LDLIBS-nss_nisplus.so += -lmachuser
-+ LDLIBS-nss_compat.so += -lmachuser
++ LDLIBS-nsl.so += $(objdir)/mach/libmachuser.so
++ LDLIBS-nss_nis.so += $(objdir)/mach/libmachuser.so
++ LDLIBS-nss_nisplus.so += $(objdir)/mach/libmachuser.so
++ LDLIBS-nss_compat.so += $(objdir)/mach/libmachuser.so
+else ifeq (nss,$(subdir))
-+ LDLIBS-nss.so += -lmachuser
-+ LDLIBS-nss_files.so += -lmachuser
++ LDLIBS-nss.so += $(objdir)/mach/libmachuser.so
++ LDLIBS-nss_files.so += $(objdir)/mach/libmachuser.so
+else ifeq (posix,$(subdir))
-+ LDLIBS-tst-rfc3484 += -lmachuser
-+ LDLIBS-tst-rfc3484-2 += -lmachuser
-+ LDLIBS-tst-rfc3484-3 += -lmachuser
++ LDLIBS-tst-rfc3484 += $(objdir)/mach/libmachuser.so
++ LDLIBS-tst-rfc3484-2 += $(objdir)/mach/libmachuser.so
++ LDLIBS-tst-rfc3484-3 += $(objdir)/mach/libmachuser.so
+endif
+
endif # in-Makerules
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: