[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: Add missing part



This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch sid
in repository glibc.

commit a81217bccca936b8ee43cfa0fd980d6e6ed8d5da
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Mon Apr 11 10:28:32 2016 +0200

    Add missing part
---
 debian/patches/hurd-i386/cvs-auxv.diff | 53 ++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/debian/patches/hurd-i386/cvs-auxv.diff b/debian/patches/hurd-i386/cvs-auxv.diff
index 74a5736..3237b5c 100644
--- a/debian/patches/hurd-i386/cvs-auxv.diff
+++ b/debian/patches/hurd-i386/cvs-auxv.diff
@@ -40,3 +40,56 @@ index 2733ac8..ddec0be 100644
  
    /* Get architecture specific definitions.  */
  #define PROCINFO_DECL
+
+commit e1ef505659e9720ebdb116a21e91e0398cd411e5
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Mon Apr 11 10:27:02 2016 +0200
+
+    Fix build with HAVE_AUX_VECTOR
+    
+    	* sysdeps/unix/sysv/linux/ldsodefs.h (HAVE_AUX_VECTOR): Define before
+    	including <ldsodefs.h>.
+    	* sysdeps/nacl/ldsodefs.h (HAVE_AUX_VECTOR): Likewise.
+
+diff --git a/sysdeps/nacl/ldsodefs.h b/sysdeps/nacl/ldsodefs.h
+index bc7723a..c6307a6 100644
+--- a/sysdeps/nacl/ldsodefs.h
++++ b/sysdeps/nacl/ldsodefs.h
+@@ -18,14 +18,14 @@
+ 
+ #ifndef	_LDSODEFS_H
+ 
++/* We have the auxiliary vector.  */
++#define HAVE_AUX_VECTOR	1
++
+ /* Get the real definitions.  */
+ #include_next <ldsodefs.h>
+ 
+ /* Now define our stuff.  */
+ 
+-/* We have the auxiliary vector.  */
+-#define HAVE_AUX_VECTOR	1
+-
+ /* Used by static binaries to check the auxiliary vector.  */
+ extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function;
+ 
+diff --git a/sysdeps/unix/sysv/linux/ldsodefs.h b/sysdeps/unix/sysv/linux/ldsodefs.h
+index 1f4d9e3..4c3676e 100644
+--- a/sysdeps/unix/sysv/linux/ldsodefs.h
++++ b/sysdeps/unix/sysv/linux/ldsodefs.h
+@@ -18,12 +18,12 @@
+ 
+ #ifndef	_LDSODEFS_H
+ 
+-/* Get the real definitions.  */
+-#include_next <ldsodefs.h>
+-
+ /* We have the auxiliary vector.  */
+ #define HAVE_AUX_VECTOR
+ 
++/* Get the real definitions.  */
++#include_next <ldsodefs.h>
++
+ /* We can assume that the kernel always provides the AT_UID, AT_EUID,
+    AT_GID, and AT_EGID values in the auxiliary vector from 2.4.0 or so on.  */
+ #define HAVE_AUX_XID

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: