From 0f169f370f4f3a6baf45b0020a461ae9844befb2 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis
Date: Thu, 18 Sep 2014 22:21:19 +0000
Subject: [PATCH] Taken care of FIXME.
---
gnu/packages/base.scm | 12 +++++-------
gnu/packages/patches/hurd-minimal.patch | 4 +---
gnu/packages/patches/libpthread-glibc-preparation.patch | 11 ++++-------
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 234194f..27c8fc1 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -533,7 +533,7 @@ with the Linux kernel.")
`(,@(package-native-inputs glibc)
("patch/libpthread-patch" ,(search-patch "libpthread-glibc-preparation.patch"))
("mig" ,mig)
- ("gettext" ,gnu-gettext) ;needed for FIXME
+ ("perl" ,perl)
("libpthread" ,(origin
(method git-fetch)
(uri (git-reference
@@ -548,12 +548,9 @@ with the Linux kernel.")
(substitute-keyword-arguments (package-arguments glibc)
((#:configure-flags cf)
`(append (list "--host=i686-pc-gnu"
- ;; Since Hurd supports only i686 disable everything
- ;; else. FIXME: needed?
- ;"--disable-multi-arch"
;; nscd fails to build for GNU/Hurd:
- ;; . Disable it.
+ ;; . Disable it.
"--disable-nscd")
,cf))
((#:phases phases)
@@ -582,8 +579,9 @@ with the Linux kernel.")
(lambda* (#:key outputs #:allow-other-keys)
(and (zero? (system* "make" "install-headers"))
- ;; Make an empty stubs.h to work around FIXME. See
- ;; .
+ ;; Make an empty stubs.h to work around not being able to
+ ;; produce a valid stubs.h and causing the build to fail. See
+ ;; .
(let ((out (assoc-ref outputs "out")))
(close-port
(open-output-file
diff --git a/gnu/packages/patches/hurd-minimal.patch b/gnu/packages/patches/hurd-minimal.patch
index 60eb344..b551d5c 100644
--- a/gnu/packages/patches/hurd-minimal.patch
+++ b/gnu/packages/patches/hurd-minimal.patch
@@ -2,9 +2,7 @@ We want to build the Hurd's libihash very early so that we can then
build libc. Because of that, we cannot link against libc, and thus
we miss 'clnt_create' and friends.
-See .
-
-FIXME: Is this explanation correct?
+See .
diff --git a/configure.ac b/configure.ac
index f8856db..a381219 100644
diff --git a/gnu/packages/patches/libpthread-glibc-preparation.patch b/gnu/packages/patches/libpthread-glibc-preparation.patch
index 2862b76..fb13dd3 100644
--- a/gnu/packages/patches/libpthread-glibc-preparation.patch
+++ b/gnu/packages/patches/libpthread-glibc-preparation.patch
@@ -15,13 +15,10 @@ index 0000000..2cdbc71
--
1.9.0
-We are using a version of GNU Mach that lacks 'thread_terminate' (not
-introduced yet) and 'thread_terminate_release' (recently removed.)
-FIXME: really? Add URLs.
-
-The 'thread_terminate' RPC call will be enough for our needs.
+We are using a version of GNU Mach that lacks 'thread_terminate_release'
+(not introduced yet).The 'thread_terminate' RPC call will be enough for
+our needs.
http://lists.gnu.org/archive/html/bug-hurd/2014-05/msg00127.html
-FIXME: then why not use it?
diff --git a/libpthread/sysdeps/mach/pt-thread-terminate.c b/libpthread/sysdeps/mach/pt-thread-terminate.c
index 6672065..129a611 100644
@@ -45,7 +42,7 @@ index 6672065..129a611 100644
The __PTHREAD_SPIN_LOCK_INITIALIZER definition is missing, so we
define it to __SPIN_LOCK_INITIALIZER which already exists.
-See .
+See http://lists.gnu.org/archive/html/commit-hurd/2009-04/msg00006.html
diff --git a/libpthread/sysdeps/mach/bits/spin-lock.h b/libpthread/sysdeps/mach/bits/spin-lock.h
index 537dac9..fca0e5a 100644
--
2.1.0