mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 23:46:13 -05:00
gnu: android-ext4-utils: Fix build.
* gnu/packages/android.scm (android-ext4-utils)[arguments]: Use gexp for 'make-flags'. Update 'unpack-core' phase.
This commit is contained in:
parent
2ac1978a9f
commit
e227b0820a
1 changed files with 12 additions and 18 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue