[glibc] 01/01: Rename some patchs merged in Hurd's topgit.
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit de97017b6ad5e34fd91bf5ad920563e477125250
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Nov 12 22:06:29 2017 +0100
Rename some patchs merged in Hurd's topgit.
* patches/hurd-i386/local-bootstrap.diff: Renamed to tg-bootstrap.diff.
* patches/hurd-i386/submitted-add-needed.diff: Renamed to
tg-mach-hurd-link.diff.
---
debian/changelog | 3 +++
.../hurd-i386/{local-bootstrap.diff => tg-bootstrap.diff} | 8 +++++++-
.../{submitted-add-needed.diff => tg-mach-hurd-link.diff} | 14 +++++++++++---
debian/patches/series | 4 ++--
4 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1035731..9e25a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ glibc (2.24-18) UNRELEASED; urgency=medium
* patches/hurd-i386/local-no_unsupported_ioctls.diff: New patch.
* patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: Complete with
clock_getres().
+ * patches/hurd-i386/local-bootstrap.diff: Renamed to tg-bootstrap.diff.
+ * patches/hurd-i386/submitted-add-needed.diff: Renamed to
+ tg-mach-hurd-link.diff.
[ Svante Signell ]
* patches/hurd-i386/submitted-exec_filename.diff: Update, fixes
diff --git a/debian/patches/hurd-i386/local-bootstrap.diff b/debian/patches/hurd-i386/tg-bootstrap.diff
similarity index 77%
rename from debian/patches/hurd-i386/local-bootstrap.diff
rename to debian/patches/hurd-i386/tg-bootstrap.diff
index 52c938c..86c06f2 100644
--- a/debian/patches/hurd-i386/local-bootstrap.diff
+++ b/debian/patches/hurd-i386/tg-bootstrap.diff
@@ -1,7 +1,11 @@
This dependency is missing, but would pose problem on Darwin
+---
+ sysdeps/mach/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
-index b47cdc6..3323e81 100644
+index 7d8c67c316..059d393db9 100644
--- a/sysdeps/mach/Makefile
+++ b/sysdeps/mach/Makefile
@@ -35,7 +35,7 @@ endif
@@ -13,3 +17,5 @@ index b47cdc6..3323e81 100644
$(patsubst %,$(mach-objpfx)mach/mach_%.h,\
port host)
+--
+tg: (7bb5f8a836..) t/bootstrap (depends on: baseline)
diff --git a/debian/patches/hurd-i386/submitted-add-needed.diff b/debian/patches/hurd-i386/tg-mach-hurd-link.diff
similarity index 60%
rename from debian/patches/hurd-i386/submitted-add-needed.diff
rename to debian/patches/hurd-i386/tg-mach-hurd-link.diff
index c77081e..6ee98ed 100644
--- a/debian/patches/hurd-i386/submitted-add-needed.diff
+++ b/debian/patches/hurd-i386/tg-mach-hurd-link.diff
@@ -1,3 +1,6 @@
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Subject: [PATCH] Add -lmachuser -lhurduser to libc.so on GNU/Hurd.
+
http://lists.gnu.org/archive/html/bug-hurd/2011-03/msg00112.html
2011-03-29 Samuel Thibault <samuel.thibault@ens-lyon.org>
@@ -5,14 +8,17 @@ http://lists.gnu.org/archive/html/bug-hurd/2011-03/msg00112.html
* Makerules ($(inst_libdir)/libc.so): Add -lmachuser -lhurduser to
libc.so on GNU/Hurd.
-No topgit branch. It's still unclear what we want to aim for.
+It's still unclear what we want to aim for.
---
- Makerules | 3 +++
+ Makerules | 3 +++
1 file changed, 3 insertions(+)
+
+diff --git a/Makerules b/Makerules
+index 53eabfaba8..b0f5e1b3a0 100644
--- a/Makerules
+++ b/Makerules
-@@ -1001,6 +1001,9 @@ $(inst_libdir)/libc.so: $(common-objpfx)
+@@ -1066,6 +1066,9 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
) > $@.new
@@ -22,3 +28,5 @@ No topgit branch. It's still unclear what we want to aim for.
mv -f $@.new $@
endif
+--
+tg: (7bb5f8a836..) t/mach-hurd-link (depends on: baseline)
diff --git a/debian/patches/series b/debian/patches/series
index 1225c75..df5d8b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -75,7 +75,7 @@ hurd-i386/tg-no-hp-timing.diff
hurd-i386/tg-sendmsg-SCM_RIGHTS.diff
hurd-i386/tg-sendmsg-SCM_CREDS.diff
hurd-i386/tg-grantpt.diff
-hurd-i386/submitted-add-needed.diff
+hurd-i386/tg-mach-hurd-link.diff
hurd-i386/local-ED.diff
hurd-i386/tg-posix_thread.diff
hurd-i386/tg-gai_misc.diff
@@ -120,7 +120,7 @@ hurd-i386/tg-reboot-startup.diff
hurd-i386/cvs-revert-gnu-gnu-cleanup.diff
hurd-i386/tg-allocalim.diff
hurd-i386/libpthread_pthread_types.diff
-hurd-i386/local-bootstrap.diff
+hurd-i386/tg-bootstrap.diff
hurd-i386/local-mach_print.diff
hurd-i386/submitted-hurd-abilist.diff
hurd-i386/local-versions.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: