From e227b0820a93c4a264a169895948d6d2c0c37005 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 31 Aug 2021 15:20:13 +0200 Subject: gnu: android-ext4-utils: Fix build. * gnu/packages/android.scm (android-ext4-utils)[arguments]: Use gexp for 'make-flags'. Update 'unpack-core' phase. --- gnu/packages/android.scm | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'gnu/packages/android.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 630a626ba2..a747b0c9b5 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -532,29 +532,23 @@ (define-public android-ext4-utils (build-system android-ndk-build-system) (arguments `(#:make-flags - (list (string-append "CPPFLAGS=" - ;"-Wno-error " - "-I " - (assoc-ref %build-inputs "android-libselinux") - "/include " - "-I " (assoc-ref %build-inputs "android-libsparse") - "/include " - "-I " (assoc-ref %build-inputs "android-libcutils") - "/include " - "-I " (assoc-ref %build-inputs "android-liblog") "/include " - "-I ../core/include") - "CFLAGS=-Wno-error" - "install-libext4_utils_host.a" - (string-append "prefix=" (assoc-ref %outputs "out"))) + ,#~(list (string-append "CPPFLAGS=" + ;"-Wno-error " + "-I " #$android-libselinux "/include " + "-I " #$android-libsparse "/include " + "-I " #$android-libcutils "/include " + "-I " #$android-liblog "/include " + "-I ../core/include") + "CFLAGS=-Wno-error" + "install-libext4_utils_host.a" + (string-append "prefix=" #$output)) #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-core (lambda* (#:key inputs #:allow-other-keys) (mkdir-p "core") - (with-directory-excursion "core" - (invoke "tar" "axf" (assoc-ref inputs "android-core") - "--strip-components=1")) - #t)) + (copy-recursively (assoc-ref inputs "android-core") + "core"))) (add-after 'unpack-core 'enter-source (lambda _ (chdir "ext4_utils") #t)) (replace 'install -- cgit v1.2.3