Without that fix, we have the following build error:
ERROR: In procedure %resolve-variable:
Unbound variable: %build-inputs
Signed-off-by: Denis 'GNUtoo' Carikli <[email protected]>
---
scripts/guix.scm | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/scripts/guix.scm b/scripts/guix.scm
index 2ef3318..9bc117e 100644
--- a/scripts/guix.scm
+++ b/scripts/guix.scm
@@ -192,11 +192,12 @@
(string-append "CFLAGS= "
;; TODO: see the comment below about
;; copying the android-core source code.
- ;; Uncomment the following lines and
- ;; remove -I ../core/include when
- ;; this is fixed:
- ;; "-I " (assoc-ref %build-inputs "android-core")
- ;; "/include "
+ ;; When this is fixed:
+ ;; - Change the make flag (list above to ,#~(list
+ ;; - Uncomment the following lines:
+ ;; "-I " #$(this-package-native-input "android-core")
+ ;; "/include "
+ ;; - remove the -I ../core/include below:
"-I core/include "))
#:phases
(modify-phases
@@ -257,22 +258,22 @@
("replicant-6-hardware_ril-headers" ,replicant-6-hardware_ril-headers)))
(arguments
`(#:make-flags
- (list
- (string-append
- "CFLAGS=-W -Wall -Wno-unused "
- "-DANDROID "
- "-I core/include "
- "-I " (assoc-ref %build-inputs "libsamsung-ipc")
- "/include/samsung-ipc "
- "-I " (assoc-ref %build-inputs "replicant-6-libhardware_legacy")
- "/include "
- "-I " (assoc-ref %build-inputs "replicant-6-hardware_ril-headers")
- "/include ")
- ;; We need to pass it LOCAL_MODULE=libsamsung-ril, else it only builds
- ;; the libsrs-client target (and not the libsamsung-ril target nor any
of
- ;; the other tools).
- ;; TODO: Build all the tools as well
- "LOCAL_MODULE=libsamsung-ril")
+ ,#~(list
+ (string-append
+ "CFLAGS=-W -Wall -Wno-unused "
+ "-DANDROID "
+ "-I core/include "
+ "-I " #$(this-package-input "libsamsung-ipc")
+ "/include/samsung-ipc "
+ "-I " #$(this-package-input "replicant-6-libhardware_legacy")
+ "/include "
+ "-I " #$(this-package-native-input
"replicant-6-hardware_ril-headers")
+ "/include ")
+ ;; We need to pass it LOCAL_MODULE=libsamsung-ril, else it only
builds
+ ;; the libsrs-client target (and not the libsamsung-ril target nor
any of
+ ;; the other tools).
+ ;; TODO: Build all the tools as well
+ "LOCAL_MODULE=libsamsung-ril")
#:phases (modify-phases
%standard-phases
(add-after
--
2.37.2
_______________________________________________
Replicant mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/replicant
