[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/17: gnu: libselinux: Remove input labels.
From: |
guix-commits |
Subject: |
10/17: gnu: libselinux: Remove input labels. |
Date: |
Sat, 13 Aug 2022 13:26:50 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 54f14833a93eab22d0c4f95e3fc38106e150f3d0
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Aug 13 13:42:39 2022 +0200
gnu: libselinux: Remove input labels.
* gnu/packages/selinux.scm (libselinux)[arguments]: Use G-expression.
[native-inputs, inputs, propagated-inputs]: Remove labels.
---
gnu/packages/selinux.scm | 59 ++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 18422ffe2e..93c256371a 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -136,43 +136,42 @@ module into a binary representation.")
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
((#:make-flags flags)
- `(cons* "PYTHON=python3"
- (string-append "LIBSEPOLA="
- (assoc-ref %build-inputs "libsepol")
- "/lib/libsepol.a")
- (string-append "PYTHONLIBDIR="
- (assoc-ref %outputs "python")
- "/lib/python"
- ,(version-major+minor (package-version python))
- "/site-packages/")
- ,flags))
+ #~(cons* "PYTHON=python3"
+ (string-append "LIBSEPOLA="
+ (search-input-file %build-inputs
+ "/lib/libsepol.a"))
+ (string-append "PYTHONLIBDIR="
+ #$output:python
+ "/lib/python"
+ #$(version-major+minor (package-version
python))
+ "/site-packages/")
+ #$flags))
((#:phases phases)
- `(modify-phases ,phases
- (delete 'portability)
- (replace 'enter-dir
- (lambda _ (chdir ,name)))
- (add-after 'build 'pywrap
- (lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "pywrap" make-flags)))
- (add-after 'install 'install-pywrap
- (lambda* (#:key make-flags outputs #:allow-other-keys)
- ;; The build system uses "python setup.py install" to install
- ;; Python bindings. Instruct it to use the correct output.
- (substitute* "src/Makefile"
- (("--prefix=\\$\\(PREFIX\\)")
- (string-append "--prefix=" (assoc-ref outputs "python"))))
- (apply invoke "make" "install-pywrap" make-flags)))))))
+ #~(modify-phases #$phases
+ (delete 'portability)
+ (replace 'enter-dir
+ (lambda _ (chdir #$name)))
+ (add-after 'build 'pywrap
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "pywrap" make-flags)))
+ (add-after 'install 'install-pywrap
+ (lambda* (#:key make-flags #:allow-other-keys)
+ ;; The build system uses "python setup.py install" to install
+ ;; Python bindings. Instruct it to use the correct output.
+ (substitute* "src/Makefile"
+ (("--prefix=\\$\\(PREFIX\\)")
+ (string-append "--prefix=" #$output:python)))
+
+ (apply invoke "make" "install-pywrap" make-flags)))))))
;; These libraries are in "Requires.private" in libselinux.pc.
(propagated-inputs
- `(("libsepol" ,libsepol)
- ("pcre2" ,pcre2)))
+ (list libsepol pcre2))
;; For pywrap phase
(inputs
- `(("python" ,python-wrapper)))
+ (list python-wrapper))
;; These inputs are only needed for the pywrap phase.
(native-inputs
- `(("swig" ,swig)
- ("pkg-config" ,pkg-config)))
+ (list pkg-config swig))
(synopsis "SELinux core libraries and utilities")
(description
"The libselinux library provides an API for SELinux applications to get
- 01/17: gnu: graphviz: Add release-monitoring-url., (continued)
- 01/17: gnu: graphviz: Add release-monitoring-url., guix-commits, 2022/08/13
- 03/17: gnu: python-numpy: Add 'upstream-name' property., guix-commits, 2022/08/13
- 05/17: gnu: python-m2r: Adjust for Python 3.10., guix-commits, 2022/08/13
- 17/17: gnu: python-setuptools: Update to 64.0.3., guix-commits, 2022/08/13
- 08/17: gnu: SELinux: Update to 3.4., guix-commits, 2022/08/13
- 09/17: gnu: checkpolicy: Remove input labels., guix-commits, 2022/08/13
- 13/17: gnu: python-sepolgen: Use G-expression and remove labels., guix-commits, 2022/08/13
- 06/17: gnu: qtractor: Fix build., guix-commits, 2022/08/13
- 16/17: gnu: policycoreutils: Use G-expression., guix-commits, 2022/08/13
- 07/17: gnu: serf: Add release-monitoring-url., guix-commits, 2022/08/13
- 10/17: gnu: libselinux: Remove input labels.,
guix-commits <=
- 15/17: gnu: libsepol: Use G-expression., guix-commits, 2022/08/13
- 02/17: gnu: python-pyaml: Update to 21.10.1., guix-commits, 2022/08/13
- 04/17: gnu: python-pre-commit: Remove unnecessary dependency., guix-commits, 2022/08/13
- 11/17: gnu: libsemanage: Remove input labels., guix-commits, 2022/08/13
- 14/17: gnu: policycoreutils: Remove input labels., guix-commits, 2022/08/13
- 12/17: gnu: secilc: Remove input labels., guix-commits, 2022/08/13