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

sthibault pushed a commit to branch sid
in repository glibc.

commit a02f91009e0c13e1d201864a3423908109eec384
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Sun Mar 20 16:51:40 2016 +0100

    hurd: New patch to fix build dependency loop
---
 debian/changelog                           |  2 ++
 debian/patches/hurd-i386/cvs-errnos.d.diff | 30 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e1cec93..ac721bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ glibc (2.22-4) UNRELEASED; urgency=medium
   [ Samuel Thibault ]
   * patches/hurd-i386/tg-sendmsg-SCM_RIGHTS.diff,tg-sendmsg-SCM_CREDS.diff:
     Update.
+  * patches/hurd-i386/cvs-errnos.d.diff: New patch to fix build dependency
+    loop.
 
  -- Aurelien Jarno <aure...@debian.org>  Sun, 13 Mar 2016 15:03:58 +0100
 
diff --git a/debian/patches/hurd-i386/cvs-errnos.d.diff 
b/debian/patches/hurd-i386/cvs-errnos.d.diff
new file mode 100644
index 0000000..8f8b5a8
--- /dev/null
+++ b/debian/patches/hurd-i386/cvs-errnos.d.diff
@@ -0,0 +1,30 @@
+commit fe43d0f464fa97f0cb4c08f3303f6a7aadd638f9
+Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+Date:   Sun Mar 20 16:44:44 2016 +0100
+
+    hurd: Break errnos.d / libc-modules.h dependency loop
+    
+    Generating errnos.d does not actually need libc-modules.h.
+    
+    * sysdeps/mach/hurd/Makefile ($(common-objpfx)errnos.d): Strip
+    "-include $(common-objpfx)libc-modules.h" from CPPFLAGS, and do not
+    depend on libc-modules.h,
+
+diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
+index 3845c57..cfaeed3 100644
+--- a/sysdeps/mach/hurd/Makefile
++++ b/sysdeps/mach/hurd/Makefile
+@@ -79,9 +79,11 @@ endef
+ # the headers we want to search for Mach error codes, listed above (and
+ # incidentally, all other headers those include).
+ -include $(common-objpfx)errnos.d
+-$(common-objpfx)errnos.d: $(mach-errnos-deps) libc-modules.h
++$(common-objpfx)errnos.d: $(mach-errnos-deps)
+       $(mach-errno-h) | \
+-      $(CC) $(CFLAGS) $(CPPFLAGS) -M -x c - | \
++      $(CC) $(CFLAGS) \
++          $(subst -include $(common-objpfx)libc-modules.h,,$(CPPFLAGS)) \
++          -M -x c - | \
+       sed $(sed-remove-objpfx) -e 's,- *:,mach-errnos-deps :=,' \
+           -e 's, \.\./, $(..),g' > $@t
+       mv -f $@t $@
diff --git a/debian/patches/series b/debian/patches/series
index c069d96..98e554b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -149,6 +149,7 @@ hurd-i386/cvs-libpthread-sigstate.diff
 hurd-i386/cvs-O_DIRECTORY.diff
 hurd-i386/cvs-raise-longjump.diff
 hurd-i386/submitted-hurd-abilist.diff
+hurd-i386/cvs-errnos.d.diff
 
 i386/local-biarch.diff
 i386/local-cmov.diff

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

Reply via email to