me
/
guix
Archived
1
0
Fork 0
Code

gnu: android-ext4-utils: Fix build. 

* gnu/packages/android.scm (android-ext4-utils)[arguments]: Use gexp for
  'make-flags'. Update 'unpack-core' phase.
master
Guillaume Le Vaillant 2021-08-31 15:20:13 +02:00
parent 2ac1978a9f
commit e227b0820a
No known key found for this signature in database
GPG Key ID: 6BE8208ADF21FE3F
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/android.scm
View File

@ -532,29 +532,23 @@ the core SELinux management utilities.")
(build-system android-ndk-build-system) (build-system android-ndk-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "CPPFLAGS=" ,#~(list (string-append "CPPFLAGS="
;"-Wno-error " ;"-Wno-error "
"-I " "-I " #$android-libselinux "/include "
(assoc-ref %build-inputs "android-libselinux") "-I " #$android-libsparse "/include "
"/include " "-I " #$android-libcutils "/include "
"-I " (assoc-ref %build-inputs "android-libsparse") "-I " #$android-liblog "/include "
"/include " "-I ../core/include")
"-I " (assoc-ref %build-inputs "android-libcutils") "CFLAGS=-Wno-error"
"/include " "install-libext4_utils_host.a"
"-I " (assoc-ref %build-inputs "android-liblog") "/include " (string-append "prefix=" #$output))
"-I ../core/include")
"CFLAGS=-Wno-error"
"install-libext4_utils_host.a"
(string-append "prefix=" (assoc-ref %outputs "out")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-core (add-after 'unpack 'unpack-core
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "core") (mkdir-p "core")
(with-directory-excursion "core" (copy-recursively (assoc-ref inputs "android-core")
(invoke "tar" "axf" (assoc-ref inputs "android-core") "core")))
"--strip-components=1"))
#t))
(add-after 'unpack-core 'enter-source (add-after 'unpack-core 'enter-source
(lambda _ (chdir "ext4_utils") #t)) (lambda _ (chdir "ext4_utils") #t))
(replace 'install (replace 'install