From 88f065c3818e2e6665ae490557415594528f2d6a Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Sat, 27 Sep 2014 20:07:19 +0300 Subject: [PATCH] gnu: base: Edits on glibc-hurd and glibc-hurd-headers. * gnu/packages/base.scm (glibc/hurd): Fix file permissions in bits/pthreadtypes.h (glibc/hurd-headers): Add configure flags : Add preconfigure phase --- gnu/packages/base.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2acb51b..53858d4 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -561,7 +561,7 @@ with the Linux kernel.") (assoc-ref %build-inputs "patch/libpthread-patch")) ;; Make the file writable. - (chmod "bits/pthreadtypes.h" #o555) + (chmod "bits/pthreadtypes.h" #o666) (copy-recursively "libpthread/sysdeps/generic/bits" "bits")) ,phases)))))) @@ -571,6 +571,11 @@ with the Linux kernel.") (outputs '("out")) (arguments (substitute-keyword-arguments (package-arguments glibc/hurd) + ;; We just pass the flags really needed to build the headers. + ((#:configure-flags _) + `(list "--enable-add-ons" + "--host=i686-pc-gnu" + "--enable-obsolete-rpc")) ((#:phases _) '(alist-replace 'install @@ -586,7 +591,16 @@ with the Linux kernel.") (string-append out "/include/gnu/stubs.h")))))) ;; Nothing to build. - (alist-delete 'build %standard-phases))))))) + (alist-delete + 'build + + ;; We need this to use `pwd', not `/bin/pwd'. + (alist-cons-before + 'configure 'pre-configure + (lambda _ + (substitute* "configure" + (("/bin/pwd") "pwd"))) + %standard-phases)))))))) (define-public tzdata (package -- 2.1.1