diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2023-02-14 02:23:30 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2023-02-14 04:26:05 +0100 |
| commit | ad031adbd6352f8afe570442efba8deda329ed90 (patch) | |
| tree | d93708c58097415745486d042559e0486c9577e3 | |
| parent | a3297e19927f06f8b6d74cf73e78f27a3288f2f2 (diff) | |
| download | hardware_replicant_libsamsung-ipc-ad031adbd6352f8afe570442efba8deda329ed90.tar.gz hardware_replicant_libsamsung-ipc-ad031adbd6352f8afe570442efba8deda329ed90.tar.bz2 hardware_replicant_libsamsung-ipc-ad031adbd6352f8afe570442efba8deda329ed90.zip | |
scripts: guix.scm: sync android-make definition with guix style
The guix style command reformats a package or a file to use the code
style used by Guix.
This commits sync the android-make definition with the output produced
by guix style.
This commit should contain no functional changes.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | scripts/guix.scm | 59 |
1 files changed, 24 insertions, 35 deletions
diff --git a/scripts/guix.scm b/scripts/guix.scm index 7d94752..d7ef7db 100644 --- a/scripts/guix.scm +++ b/scripts/guix.scm @@ -131,44 +131,33 @@ (define android-make #~(lambda (target android-local-modules) - (lambda* - (#:key inputs - make-flags - native-inputs - outputs - #:allow-other-keys) - (substitute* - "Android.mk" - (("BUILD_SHARED_LIBRARY") - "BUILD_HOST_SHARED_LIBRARY") - (("BUILD_EXECUTABLE") "BUILD_HOST_EXECUTABLE")) - ((assoc-ref %standard-phases target) - #:inputs inputs - #:outputs outputs - ;; TODO: use pkg-config for -lssl -lcrypto - #:make-flags - (append - make-flags - '("LDFLAGS=-lssl -lcrypto" - "LOCAL_MODULE=libsamsung-ipc" - "SO=libsamsung-ipc.so"))) - (map-in-order - (lambda (local-module) + (lambda* (#:key inputs make-flags native-inputs outputs + #:allow-other-keys) + (substitute* "Android.mk" + (("BUILD_SHARED_LIBRARY") + "BUILD_HOST_SHARED_LIBRARY") + (("BUILD_EXECUTABLE") + "BUILD_HOST_EXECUTABLE")) ((assoc-ref %standard-phases target) #:inputs inputs #:outputs outputs - ;; TODO: use pkg-config for -lssl -lcrypto - #:make-flags - (append - make-flags - (list - (string-append - "LDFLAGS=-Wl,-rpath=" - #$output - "/lib -lssl -lcrypto -L .") - (string-append "LOCAL_MODULE=" - local-module))))) - android-local-modules)))) + #:make-flags (append make-flags + '("LDFLAGS=-lssl -lcrypto" + "LOCAL_MODULE=libsamsung-ipc" + "SO=libsamsung-ipc.so"))) + (map-in-order (lambda (local-module) + ((assoc-ref %standard-phases target) + #:inputs inputs + #:outputs outputs + #:make-flags (append make-flags + (list (string-append + "LDFLAGS=-Wl,-rpath=" + #$output + "/lib -lssl -lcrypto -L .") + (string-append + "LOCAL_MODULE=" + local-module))))) + android-local-modules)))) (define android-phases #~(modify-phases %standard-phases |