[glibc] 01/01: patches/kfreebsd/local-sysdeps.diff: update to revision 6015 (from glibc-bsd) to fix FTBFS.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit b8beb9820df87042d2ba2dd2c46da7590363a4f7
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed Apr 20 20:11:28 2016 +0200
patches/kfreebsd/local-sysdeps.diff: update to revision 6015 (from glibc-bsd) to fix FTBFS.
---
debian/changelog | 4 ++++
debian/patches/kfreebsd/local-sysdeps.diff | 10 ++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 29d4117..1093701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ glibc (2.22-8) UNRELEASED; urgency=medium
* hurd-i386/cvs-gprof-tick.diff: Cherry-pick from upstream to fix gprof
timing.
+ [ Aurelien Jarno ]
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 6015 (from
+ glibc-bsd) to fix FTBFS.
+
-- Samuel Thibault <sthibault@debian.org> Tue, 19 Apr 2016 23:28:29 +0200
glibc (2.22-7) unstable; urgency=medium
diff --git a/debian/patches/kfreebsd/local-sysdeps.diff b/debian/patches/kfreebsd/local-sysdeps.diff
index 2197ba2..2184fd3 100644
--- a/debian/patches/kfreebsd/local-sysdeps.diff
+++ b/debian/patches/kfreebsd/local-sysdeps.diff
@@ -21646,7 +21646,7 @@
+
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/ldsodefs.h
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,58 @@
+/* Run-time dynamic linker data structures for loaded ELF shared objects.
+ Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -21668,17 +21668,15 @@
+
+#ifndef _LDSODEFS_H
+
-+/* Get the real definitions. */
-+#include_next <ldsodefs.h>
-+
-+/* Now define our stuff. */
-+
+/* FreeBSD puts some extra information into an auxiliary vector when it
+ execs ELF executables. Note that it uses AT_* values of 10 and 11
+ to denote something different than AT_NOTELF and AT_UID, but this is
+ not a problem since elf/dl-support.c ignores these AT_* values. */
+#define HAVE_AUX_VECTOR
+
++/* Get the real definitions. */
++#include_next <ldsodefs.h>
++
+/* Used by static binaries to check the auxiliary vector. */
+extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function;
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: