01/01: gnu: libsepol: Fix build on non-x86_64.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 50e8790335e85546c9d29cdae070a87368e9662c
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Jan 29 22:13:29 2018 +0100

    gnu: libsepol: Fix build on non-x86_64.
    
    * gnu/packages/selinux.scm (libsepol)[arguments]: Add phase "portability".
    (checkpolicy, libselinux, libsemanage, secilc, python-sepolgen,
    python-setools, policycoreutils)[arguments]: Remove inherited phase
    "portability".
---
 gnu/packages/selinux.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 99f9e76..3db1b45 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -73,7 +73,14 @@
        (modify-phases %standard-phases
          (delete 'configure)
          (add-after 'unpack 'enter-dir
-           (lambda _ (chdir ,name) #t)))))
+           (lambda _ (chdir ,name) #t))
+         (add-after 'enter-dir 'portability
+           (lambda _
+             (substitute* "src/ibpkeys.c"
+               (("#include \"ibpkey_internal.h\"" line)
+                (string-append line "\n#include <inttypes.h>\n"))
+               (("%#lx") "%#\" PRIx64 \""))
+             #t)))))
     (native-inputs
      `(("flex" ,flex)))
     (home-page "https://selinuxproject.org/";)
@@ -101,6 +108,7 @@ boolean settings).")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
+         (delete 'portability)
          (add-after 'unpack 'enter-dir
            (lambda _ (chdir ,name) #t)))))
     (inputs
@@ -136,6 +144,7 @@ module into a binary representation.")
                 ,flags))
        ((#:phases phases)
         `(modify-phases ,phases
+           (delete 'portability)
            (replace 'enter-dir
              (lambda _ (chdir ,name) #t))
            (add-after 'enter-dir 'remove-Werror
@@ -187,6 +196,7 @@ the core SELinux management utilities.")
                 ,flags))
        ((#:phases phases)
         `(modify-phases ,phases
+           (delete 'portability)
            (replace 'enter-dir
              (lambda _ (chdir ,name) #t))
            (add-after 'build 'pywrap
@@ -228,6 +238,7 @@ binary policies.")
                  ,flags)))
        ((#:phases phases)
         `(modify-phases ,phases
+           (delete 'portability)
            (replace 'enter-dir
              (lambda _ (chdir ,name) #t))))))
     (inputs
@@ -250,6 +261,7 @@ binary policies.")
        ,@(substitute-keyword-arguments (package-arguments libsepol)
            ((#:phases phases)
             `(modify-phases ,phases
+               (delete 'portability)
                (replace 'enter-dir
                  (lambda _ (chdir "python/sepolgen") #t))
                ;; By default all Python files would be installed to
@@ -310,6 +322,7 @@ based on required access.")
      `(#:tests? #f ; the test target causes a rebuild
        #:phases
        (modify-phases %standard-phases
+         (delete 'portability)
          (add-after 'unpack 'set-SEPOL-variable
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "SEPOL"
@@ -372,6 +385,7 @@ tools, and libraries designed to facilitate SELinux policy 
analysis.")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
+         (delete 'portability)
          (add-after 'unpack 'enter-dir
            (lambda _ (chdir ,name) #t))
          (add-after 'enter-dir 'ignore-/usr-tests