From dfb4a28575d7afb7883837d51249b3757761ada7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Nov 2020 14:38:57 +0200 Subject: gnu: lz4: Cross compile. * gnu/packages/compression.scm (lz4)[arguments]: When targeting another system use cc-for-target in make-flags. --- gnu/packages/compression.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c5e72a5084..d61c6bf719 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -804,7 +804,10 @@ decompression of some loosely related file formats used by Microsoft.") ("valgrind" ,valgrind))) (arguments `(#:test-target "test" - #:make-flags (list "CC=gcc" + ;; TODO: Integrate in next rebuild cycle. + #:make-flags (list ,(if (%current-target-system) + (string-append "CC=" (cc-for-target)) + "CC=gcc") (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure) ;no configure script -- cgit v1.2.3 From c0040f0ed05781a189ca24bff00e1ee5979b7835 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Nov 2020 14:39:41 +0200 Subject: gnu: squashfs-tools: Cross compile. * gnu/packages/compression.scm (squashfs-tools)[arguments]: Use cc-for-target in make-flags. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d61c6bf719..4b6ec79457 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -848,9 +848,9 @@ time for compression ratio.") "0zmhvczscqz0mzh4b9m8m42asq14db0a6lc8clp5ljq5ybrv70d9")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:make-flags - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) "XZ_SUPPORT=1" "LZO_SUPPORT=1" "LZ4_SUPPORT=1" -- cgit v1.2.3 From 40b52444bb532489d8ac7418d304691a18fdf177 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Nov 2020 14:40:50 +0200 Subject: gnu: bsdiff: Cross compile. * gnu/packages/compression.scm (bsdiff)[arguments]: Use cc-for-target in make-flags. --- gnu/packages/compression.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4b6ec79457..2323215034 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -955,7 +955,8 @@ tarballs.") "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "INSTALL=install" "CC=gcc" + `(#:make-flags (list "INSTALL=install" + (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 9f58c83c3a94210fe75297eff09a56680c4c9fa8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Nov 2020 14:47:37 +0200 Subject: gnu: zstd: Cross compile. * gnu/packages/compression.scm (zstd)[arguments]: When targeting another system use cc-for-target in make-flags. --- gnu/packages/compression.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2323215034..e7993f2b42 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1426,7 +1426,10 @@ or junctions, and always follows hard links.") #t)))) #:make-flags - (list "CC=gcc" + ;; TODO: Integrate in next rebuild cycle. + (list ,(if (%current-target-system) + (string-append "CC=" (cc-for-target)) + "CC=gcc") (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib") (string-append "INCLUDEDIR=" (assoc-ref %outputs "lib") "/include") -- cgit v1.2.3 From 455daf46adadf47582f57ff2ec8898b927913793 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Nov 2020 15:10:30 +0200 Subject: gnu: pzstd: Cross compile. * gnu/packages/compression.scm (pzstd)[arguments]: use cc-for-target, cxx-for-target in make-flags. [native-inputs]: Only use googletest when compiling natively. [inputs]: Add googletest when cross compiling. --- gnu/packages/compression.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e7993f2b42..c19946f15c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1461,8 +1461,14 @@ speed.") (version (package-version zstd)) (source (package-source zstd)) (build-system gnu-build-system) + (inputs + `(,@(if (%current-target-system) + `(("googletest" ,googletest)) + '()))) (native-inputs - `(("googletest" ,googletest))) + `(,@(if (%current-system) + `(("googletest" ,googletest)) + '()))) (arguments `(#:phases (modify-phases %standard-phases @@ -1480,7 +1486,8 @@ speed.") (install-file "README.md" doc) #t)))) #:make-flags - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) + (string-append "CXX=" ,(cxx-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (home-page (package-home-page zstd)) (synopsis "Threaded implementation of the Zstandard compression algorithm") -- cgit v1.2.3