diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
| commit | bee7bb315cd0b4529a4117b6220c29ca297fc023 (patch) | |
| tree | fe4741f257e50782e51bc2955ad4480cd2ba6396 /gnu/packages/selinux.scm | |
| parent | c2f0e5a44b537632c2655f97a2539c3bf02c8a63 (diff) | |
| parent | 8a4644336d5063fd0bf43e90e3c0823c76e82e4e (diff) | |
| download | patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/selinux.scm')
| -rw-r--r-- | gnu/packages/selinux.scm | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 99f9e76e29..3db1b458c7 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 |