From 53ac77389c884106adfe15b6253014357246fc3f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Mar 2022 01:00:01 +0100 Subject: gnu: cdrtools: Prepare for cross-compilation. * gnu/packages/cdrom.scm (cdrtools)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/cdrom.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/cdrom.scm') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 3f2429aeeb..02a7668686 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -321,7 +321,8 @@ format, commonly used for VCDs or disks with subchannel data.") (arguments `(#:make-flags (list "RM=rm" "LN=ln" "SYMLINK=ln -s" - "CONFIG_SHELL=sh" "CCOM=gcc" + "CONFIG_SHELL=sh" + (string-append "CCOM=" ,(cc-for-target)) (string-append "INS_BASE=" (assoc-ref %outputs "out")) (string-append "INS_RBASE=" (assoc-ref %outputs "out"))) ;; Parallel builds appear to be unsafe, see -- cgit 1.4.1 From b97a8b89418263bb1d025d6911923f68d662a82b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Mar 2022 01:00:01 +0100 Subject: gnu: cdrtools: Link dynamically. * gnu/packages/cdrom.scm (cdrtools)[arguments]: Add "LINKMODE=dynamic" to the #:configure-flags. --- gnu/packages/cdrom.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/cdrom.scm') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 02a7668686..20e7a55e2d 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -323,6 +323,7 @@ format, commonly used for VCDs or disks with subchannel data.") (list "RM=rm" "LN=ln" "SYMLINK=ln -s" "CONFIG_SHELL=sh" (string-append "CCOM=" ,(cc-for-target)) + "LINKMODE=dynamic" (string-append "INS_BASE=" (assoc-ref %outputs "out")) (string-append "INS_RBASE=" (assoc-ref %outputs "out"))) ;; Parallel builds appear to be unsafe, see -- cgit 1.4.1 From 0ac0f43a90dc08eac014447d7702abe0029e073d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Mar 2022 01:00:01 +0100 Subject: gnu: cdrtools: Use G-expressions. * gnu/packages/cdrom.scm (cdrtools)[arguments]: Rewrite as G-expressions. Don't return #t from phases. --- gnu/packages/cdrom.scm | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'gnu/packages/cdrom.scm') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 20e7a55e2d..4401420fe7 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -319,33 +319,32 @@ format, commonly used for VCDs or disks with subchannel data.") (build-system gnu-build-system) ;; XXX cdrtools bundles a modified, relicensed early version of cdparanoia. (arguments - `(#:make-flags - (list "RM=rm" "LN=ln" "SYMLINK=ln -s" - "CONFIG_SHELL=sh" - (string-append "CCOM=" ,(cc-for-target)) - "LINKMODE=dynamic" - (string-append "INS_BASE=" (assoc-ref %outputs "out")) - (string-append "INS_RBASE=" (assoc-ref %outputs "out"))) - ;; Parallel builds appear to be unsafe, see - ;; https://hydra.gnu.org/build/3346840/log/raw - #:parallel-build? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'set-linux-headers - (lambda _ - (substitute* "autoconf/configure" - (("/usr/src/linux") - (assoc-ref %build-inputs "kernel-headers"))) - #t)) - (add-before 'build 'substitute-dirs - (lambda _ - (substitute* (append (find-files "DEFAULTS" "^Defaults\\.") - (find-files "DEFAULTS_ENG" "^Defaults\\.") - (find-files "TEMPLATES" "^Defaults\\.")) - (("/opt/schily") (assoc-ref %outputs "out"))) - #t))) - #:tests? #f)) ; no tests + (list #:make-flags + #~(list "RM=rm" "LN=ln" "SYMLINK=ln -s" + "CONFIG_SHELL=sh" + (string-append "CCOM=" #$(cc-for-target)) + "LINKMODE=dynamic" + (string-append "INS_BASE=" #$output) + (string-append "INS_RBASE=" #$output)) + ;; Parallel builds appear to be unsafe, see + ;; https://hydra.gnu.org/build/3346840/log/raw + #:parallel-build? #f + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-linux-headers + (lambda _ + (substitute* "autoconf/configure" + (("/usr/src/linux") + (assoc-ref %build-inputs "kernel-headers"))))) + (add-before 'build 'avoid-bogus-RPATH-entry + (lambda _ + (substitute* (append (find-files "DEFAULTS" "^Defaults\\.") + (find-files "DEFAULTS_ENG" "^Defaults\\.") + (find-files "TEMPLATES" "^Defaults\\.")) + (("/opt/schily") + #$output))))) + #:tests? #f)) ; no tests (synopsis "Command line utilities to manipulate and burn CD/DVD/BD images") (description "cdrtools is a collection of command line utilities to create CD's, DVD's or Blue Ray discs. The most important components are -- cgit 1.4.1 From 1ef6203630d29c0416fa42eed6d5f439af7cdf6f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Mar 2022 01:00:01 +0100 Subject: gnu: cdrtools: Don't return #t from snippet. * gnu/packages/cdrom.scm (cdrtools)[source]: Don't return #t from snippet. --- gnu/packages/cdrom.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/cdrom.scm') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 4401420fe7..56a4ab8a10 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -313,8 +313,7 @@ format, commonly used for VCDs or disks with subchannel data.") (string-append "actual_os := $(shell uname -o)\n" "actual_arch := $(shell uname -m)\n" - "VERSION_OS = _$(actual_os)_$(actual_arch)\n"))) - #t)) + "VERSION_OS = _$(actual_os)_$(actual_arch)\n"))))) (patches (search-patches "cdrtools-3.01-mkisofs-isoinfo.patch")))) (build-system gnu-build-system) ;; XXX cdrtools bundles a modified, relicensed early version of cdparanoia. -- cgit 1.4.1