Merge commit 'e25d4ea07b09e7e6df61777988c1fc104f0a538e'

3 files changed, 36 insertions, 6 deletions

diff --git a/hurd/dde/guide.mdwn b/hurd/dde/guide.mdwn
index 132b36ae..dd36f1f5 100644
--- a/hurd/dde/guide.mdwn
+++ b/hurd/dde/guide.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2010, 2011 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2010, 2011, 2016 Free Software Foundation,
+Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
 id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -43,9 +44,9 @@ Prepare apt offline configuration so we can get necessary packages:
 
 	$ cd /mnt/etc/apt
 
-	$ echo "deb http://ftp.debian-ports.org/debian unreleased main" >> sources.list # if you don't have sources.list set up yet on the Hurd system
+	$ echo "deb http://ftp.ports.debian.org/debian-ports unreleased main" >> sources.list # if you don't have sources.list set up yet on the Hurd system
 
-	$ echo "deb-src http://ftp.debian-ports.org/debian unreleased main" >> sources.list
+	$ echo "deb-src http://ftp.ports.debian.org/debian-ports unreleased main" >> sources.list
 
 	$ echo "deb http://ftp.uk.debian.org/debian unstable main" >> sources.list
 
diff --git a/hurd/debugging/glibc.mdwn b/hurd/debugging/glibc.mdwn
index 14140fdb..71e027d2 100644
--- a/hurd/debugging/glibc.mdwn
+++ b/hurd/debugging/glibc.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2007, 2008, 2010, 2011, 2013 Free Software
+[[!meta copyright="Copyright © 2007, 2008, 2010, 2011, 2013, 2016 Free Software
 Foundation, Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -35,6 +35,35 @@ There is a list of [[known failures|open_issues/glibc]].
 
 ---
 
+When building the debian glibc, to save yourself a double-compilation, comment
+in debian/sysdeps/hurd-i386.mk the lines about xen. Then to avoid the whole
+testsuite, use:
+
+    DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage
+
+To save even more build, stop the build after configure has run, and then you
+can restart the build of only libc.so and libc.a with:
+
+    cd build-tree/hurd-i386-libc
+    make lib
+
+or of only libc.so with:
+
+    make objdir=$PWD/build-tree/hurd-i386-libc $PWD/build-tree/hurd-i386-libc/libc.so
+
+or of the whole tree with:
+
+    cd build-tree/hurd-i386-libc
+    make
+
+or of just one subdir with for instance:
+
+    make subdir=libpthread -C libpthread ..=../ objdir=$PWD/build-tree/hurd-i386-libc
+
+(note that most subdirs need libc.so built)
+
+---
+
 If you've been doing simple changes to glibc functions that end up in
 `libc.so`, you may test them like this (like for a `strerror_l` implementation
 in this case):
diff --git a/hurd/running/debian/patch_submission.mdwn b/hurd/running/debian/patch_submission.mdwn
index 1dd8a4db..d1a3ba33 100644
--- a/hurd/running/debian/patch_submission.mdwn
+++ b/hurd/running/debian/patch_submission.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2007, 2008, 2011 Free Software Foundation,
+[[!meta copyright="Copyright © 2007, 2008, 2011, 2016 Free Software Foundation,
 Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -49,7 +49,7 @@ the specified tags for the current user, and *X-Debbugs-CC* so that the
 
 In the bug description, mention that the package fails to build on hurd-i386
 and (if possible) quote the failure.  If possible, point to the failing build
-log from <http://buildd.debian-ports.org/build.php> or elsewhere.
+log from <http://buildd.debian.org/> or elsewhere.
 
 Then, explain the failure (Debian maintainers usually do not know much about
 Hurd-specific failures), and attach the patch.