diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-08-31 16:31:54 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-08-31 17:17:53 +0200 |
| commit | b88baa0bdad1365f12949bf31bc3ac303f37e558 (patch) | |
| tree | 4441fded6726036741d7d2012d0595574df4430b | |
| parent | dd8e1eae1f8d17d168969af5756901a7df5be4fc (diff) | |
| download | hardware_replicant_libsamsung-ril-b88baa0bdad1365f12949bf31bc3ac303f37e558.tar.gz hardware_replicant_libsamsung-ril-b88baa0bdad1365f12949bf31bc3ac303f37e558.tar.bz2 hardware_replicant_libsamsung-ril-b88baa0bdad1365f12949bf31bc3ac303f37e558.zip | |
guix.scm: libsamsung-ril: fix "Unbound variable: %build-inputs"
Without that fix, we have the following build error:
ERROR: In procedure %resolve-variable:
Unbound variable: %build-inputs
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | scripts/guix.scm | 43 |
1 files 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 |