Merge branch 'master' into core-updates

2 files changed, 91 insertions, 38 deletions

diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 9c082b4352..549612fa3c 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -21,6 +21,7 @@
 
 (define-module (guix build syscalls)
   #:use-module (system foreign)
+  #:use-module (system base target)             ;for cross-compilation support
   #:use-module (rnrs bytevectors)
   #:autoload   (ice-9 binary-ports) (get-bytevector-n)
   #:use-module (srfi srfi-1)
@@ -824,28 +825,75 @@ system to PUT-OLD."
 ;;; Opendir & co.
 ;;;
 
-(define-c-struct %struct-dirent-header
-  sizeof-dirent-header
+(define (file-type->symbol type)
+  ;; Convert TYPE to symbols like 'stat:type' does.
+  (cond ((= type DT_REG)  'regular)
+        ((= type DT_LNK)  'symlink)
+        ((= type DT_DIR)  'directory)
+        ((= type DT_FIFO) 'fifo)
+        ((= type DT_CHR)  'char-special)
+        ((= type DT_BLK)  'block-special)
+        ((= type DT_SOCK) 'socket)
+        (else             'unknown)))
+
+;; 'struct dirent64' for GNU/Linux.
+(define-c-struct %struct-dirent-header/linux
+  sizeof-dirent-header/linux
   (lambda (inode offset length type name)
-    ;; Convert TYPE to symbols like 'stat:type' does.
-    (let ((type (cond ((= type DT_REG)  'regular)
-                      ((= type DT_LNK)  'symlink)
-                      ((= type DT_DIR)  'directory)
-                      ((= type DT_FIFO) 'fifo)
-                      ((= type DT_CHR)  'char-special)
-                      ((= type DT_BLK)  'block-special)
-                      ((= type DT_SOCK) 'socket)
-                      (else             'unknown))))
-      `((type . ,type)
-        (inode . ,inode))))
-  read-dirent-header
-  write-dirent-header!
+    `((type . ,(file-type->symbol type))
+      (inode . ,inode)))
+  read-dirent-header/linux
+  write-dirent-header!/linux
   (inode  int64)
   (offset int64)
   (length unsigned-short)
   (type   uint8)
   (name   uint8))                                 ;first byte of 'd_name'
 
+;; 'struct dirent64' for GNU/Hurd.
+(define-c-struct %struct-dirent-header/hurd
+  sizeof-dirent-header/hurd
+  (lambda (inode length type name-length name)
+    `((type . ,(file-type->symbol type))
+      (inode . ,inode)))
+  read-dirent-header/hurd
+  write-dirent-header!/hurd
+  (inode   int64)
+  (length  unsigned-short)
+  (type    uint8)
+  (namelen uint8)
+  (name    uint8))
+
+(define-syntax define-generic-identifier
+  (syntax-rules (gnu/linux gnu/hurd =>)
+    "Define a generic identifier that adjust to the current GNU variant."
+    ((_ id (gnu/linux => linux) (gnu/hurd => hurd))
+     (define-syntax id
+       (lambda (s)
+         (syntax-case s ()
+           ((_ args (... ...))
+            (if (string-contains (or (target-type) %host-type)
+                                 "linux")
+                #'(linux args (... ...))
+                #'(hurd args (... ...))))
+           (_
+            (if (string-contains (or (target-type) %host-type)
+                                 "linux")
+                #'linux
+                #'hurd))))))))
+
+(define-generic-identifier read-dirent-header
+  (gnu/linux => read-dirent-header/linux)
+  (gnu/hurd  => read-dirent-header/hurd))
+
+(define-generic-identifier %struct-dirent-header
+  (gnu/linux => %struct-dirent-header/linux)
+  (gnu/hurd  => %struct-dirent-header/hurd))
+
+(define-generic-identifier sizeof-dirent-header
+  (gnu/linux => sizeof-dirent-header/linux)
+  (gnu/hurd  => sizeof-dirent-header/hurd))
+
 ;; Constants for the 'type' field, from <dirent.h>.
 (define DT_UNKNOWN 0)
 (define DT_FIFO 1)
diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index c1fd9fd9af..c0f262a5c0 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -19,7 +19,9 @@
 (define-module (guix build texlive-build-system)
   #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
+  #:use-module (guix build union)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 ftw)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:export (%standard-phases
@@ -38,31 +40,34 @@
                   (string-append "&" format)
                   file)))
 
-(define* (build #:key inputs build-targets tex-format #:allow-other-keys)
-  ;; Find additional tex and sty files
-  (setenv "TEXINPUTS"
-          (string-append
-           (getcwd) ":" (getcwd) "/build:"
-           (string-join
-            (append-map (match-lambda
-                          ((_ . dir)
-                           (find-files dir
-                                       (lambda (_ stat)
-                                         (eq? 'directory (stat:type stat)))
-                                       #:directories? #t
-                                       #:stat stat)))
-                        inputs)
-            ":")))
-  (setenv "TEXFORMATS"
-          (string-append (assoc-ref inputs "texlive-latex-base")
-                         "/share/texmf-dist/web2c/"))
-  (setenv "LUAINPUTS"
-          (string-append (assoc-ref inputs "texlive-latex-base")
-                         "/share/texmf-dist/tex/latex/base/"))
+(define* (configure #:key inputs #:allow-other-keys)
+  (let* ((out       (string-append (getcwd) "/.texlive-union"))
+         (texmf.cnf (string-append out "/share/texmf-dist/web2c/texmf.cnf")))
+    ;; Build a modifiable union of all inputs (but exclude bash)
+    (match inputs
+      (((names . directories) ...)
+       (union-build out directories
+                    #:create-all-directories? #t
+                    #:log-port (%make-void-port "w"))))
+
+    ;; The configuration file "texmf.cnf" is provided by the
+    ;; "texlive-bin" package.  We take it and override only the
+    ;; setting for TEXMFROOT and TEXMF.  This file won't be consulted
+    ;; by default, though, so we still need to set TEXMFCNF.
+    (substitute* texmf.cnf
+      (("^TEXMFROOT = .*")
+       (string-append "TEXMFROOT = " out "/share\n"))
+      (("^TEXMF = .*")
+       "TEXMF = $TEXMFROOT/share/texmf-dist\n"))
+    (setenv "TEXMFCNF" (dirname texmf.cnf))
+    (setenv "TEXMF" (string-append out "/share/texmf-dist")))
   (mkdir "build")
+  #t)
+
+(define* (build #:key inputs build-targets tex-format #:allow-other-keys)
   (every (cut compile-with-latex tex-format <>)
          (if build-targets build-targets
-             (find-files "." "\\.ins$"))))
+             (scandir "." (cut string-suffix? ".ins" <>)))))
 
 (define* (install #:key outputs tex-directory #:allow-other-keys)
   (let* ((out (assoc-ref outputs "out"))
@@ -76,7 +81,7 @@
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases
-    (delete 'configure)
+    (replace 'configure configure)
     (replace 'build build)
     (delete 'check)
     (replace 'install install)))