* [bug#64421] [PATCH] gnu: efivar: Fix cross-compilation.
@ 2023-07-02 13:35 dan
2023-07-02 13:44 ` [bug#64421] [PATCH v2] " dan
0 siblings, 1 reply; 3+ messages in thread
From: dan @ 2023-07-02 13:35 UTC (permalink / raw)
To: 64421
[version]: Temporarily change the version to a git-version.
[source]: Fetch source from git, use newer commit to fix cross-build.
[arguments]<#:make-flags>: Set HOSTCC to gcc.
copyright
---
gnu/packages/linux.scm | 85 ++++++++++++++++++++++--------------------
1 file changed, 44 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ffb736f447..16b9755f52 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -74,6 +74,7 @@
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -7223,48 +7224,50 @@ (define-public radeontop
(license license:gpl3)))
(define-public efivar
- (package
- (name "efivar")
- (version "38")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/rhboot/" name
- "/releases/download/" version "/" name
- "-" version ".tar.bz2"))
- (sha256
- (base32
- "0jaka7b4lccswjqiv4liclkj6w78gildg7vd6dnw3wf595pfs67h"))
- (patches
- (search-patches "efivar-211.patch"))))
-
- (build-system gnu-build-system)
- (arguments
- (list
- ;; Tests require a UEFI system and is not detected in the chroot.
- #:tests? #f
- #:make-flags
- #~(list (string-append "prefix=" #$output)
- (string-append "libdir=" #$output "/lib")
- (string-append "CC=" #$(cc-for-target))
- (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'build-deterministically
- (lambda _
- (substitute* "src/include/defaults.mk"
- ;; Don't use -march=native.
- (("-march=native")
- ""))))
- (delete 'configure))))
- (native-inputs
- (list mandoc pkg-config))
- (inputs
- (list popt))
- (home-page "https://github.com/rhboot/efivar")
- (synopsis "Tool and library to manipulate EFI variables")
- (description "This package provides a library and a command line
+ ;; XXX: 15622b7e5761f3dde3f0e42081380b2b41639a48 fixes compilation on i686.
+ ;; ca48d3964d26f5e3b38d73655f19b1836b16bd2d fixes cross-compilation.
+ (let ((commit "ca48d3964d26f5e3b38d73655f19b1836b16bd2d")
+ (revision "0"))
+ (package
+ (name "efivar")
+ (version (git-version "38" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rhboot/efivar")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zsab3hcv1v53cxwkvsk09ifnwhs48a6xa3kxlwvs87yxswspvi8"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ ;; Tests require a UEFI system and is not detected in the chroot.
+ #:tests? #f
+ #:make-flags
+ #~(list (string-append "prefix=" #$output)
+ (string-append "libdir=" #$output "/lib")
+ (string-append "CC=" #$(cc-for-target))
+ "HOSTCC=gcc"
+ (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'build-deterministically
+ (lambda _
+ (substitute* "src/include/defaults.mk"
+ ;; Don't use -march=native.
+ (("-march=native")
+ ""))))
+ (delete 'configure))))
+ (native-inputs
+ (list mandoc pkg-config))
+ (inputs
+ (list popt))
+ (home-page "https://github.com/rhboot/efivar")
+ (synopsis "Tool and library to manipulate EFI variables")
+ (description "This package provides a library and a command line
interface to the variable facility of UEFI boot firmware.")
- (license license:lgpl2.1+)))
+ (license license:lgpl2.1+))))
(define-public efibootmgr
(package
base-commit: a919a16898e7219fdd26bdfe33a9959e7156d59d
--
2.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#64421] [PATCH v2] gnu: efivar: Fix cross-compilation.
2023-07-02 13:35 [bug#64421] [PATCH] gnu: efivar: Fix cross-compilation dan
@ 2023-07-02 13:44 ` dan
2023-09-06 0:42 ` bug#64421: [PATCH] " Maxim Cournoyer
0 siblings, 1 reply; 3+ messages in thread
From: dan @ 2023-07-02 13:44 UTC (permalink / raw)
To: 64421
[version]: Temporarily change the version to a git-version.
[source]: Fetch source from git, use newer commit to fix cross-build.
[arguments]<#:make-flags>: Set HOSTCC to gcc.
---
gnu/packages/linux.scm | 85 ++++++++++++++++++++++--------------------
1 file changed, 44 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ffb736f447..a8aacdffac 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -74,6 +74,7 @@
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -7223,48 +7224,50 @@ (define-public radeontop
(license license:gpl3)))
(define-public efivar
- (package
- (name "efivar")
- (version "38")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/rhboot/" name
- "/releases/download/" version "/" name
- "-" version ".tar.bz2"))
- (sha256
- (base32
- "0jaka7b4lccswjqiv4liclkj6w78gildg7vd6dnw3wf595pfs67h"))
- (patches
- (search-patches "efivar-211.patch"))))
-
- (build-system gnu-build-system)
- (arguments
- (list
- ;; Tests require a UEFI system and is not detected in the chroot.
- #:tests? #f
- #:make-flags
- #~(list (string-append "prefix=" #$output)
- (string-append "libdir=" #$output "/lib")
- (string-append "CC=" #$(cc-for-target))
- (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'build-deterministically
- (lambda _
- (substitute* "src/include/defaults.mk"
- ;; Don't use -march=native.
- (("-march=native")
- ""))))
- (delete 'configure))))
- (native-inputs
- (list mandoc pkg-config))
- (inputs
- (list popt))
- (home-page "https://github.com/rhboot/efivar")
- (synopsis "Tool and library to manipulate EFI variables")
- (description "This package provides a library and a command line
+ ;; XXX: 15622b7e5761f3dde3f0e42081380b2b41639a48 fixes compilation on i686.
+ ;; ca48d3964d26f5e3b38d73655f19b1836b16bd2d fixes cross-compilation.
+ (let ((commit "ca48d3964d26f5e3b38d73655f19b1836b16bd2d")
+ (revision "0"))
+ (package
+ (name "efivar")
+ (version (git-version "38" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rhboot/efivar")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zsab3hcv1v53cxwkvsk09ifnwhs48a6xa3kxlwvs87yxswspvi8"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ ;; Tests require a UEFI system and is not detected in the chroot.
+ #:tests? #f
+ #:make-flags #~(list (string-append "prefix="
+ #$output)
+ (string-append "libdir="
+ #$output "/lib")
+ (string-append "CC="
+ #$(cc-for-target)) "HOSTCC=gcc"
+ (string-append "LDFLAGS=-Wl,-rpath="
+ #$output "/lib"))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'build-deterministically
+ (lambda _
+ (substitute* "src/include/defaults.mk"
+ ;; Don't use -march=native.
+ (("-march=native")
+ ""))))
+ (delete 'configure))))
+ (native-inputs (list mandoc pkg-config))
+ (inputs (list popt))
+ (home-page "https://github.com/rhboot/efivar")
+ (synopsis "Tool and library to manipulate EFI variables")
+ (description "This package provides a library and a command line
interface to the variable facility of UEFI boot firmware.")
- (license license:lgpl2.1+)))
+ (license license:lgpl2.1+))))
(define-public efibootmgr
(package
base-commit: a919a16898e7219fdd26bdfe33a9959e7156d59d
--
2.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#64421: [PATCH] gnu: efivar: Fix cross-compilation.
2023-07-02 13:44 ` [bug#64421] [PATCH v2] " dan
@ 2023-09-06 0:42 ` Maxim Cournoyer
0 siblings, 0 replies; 3+ messages in thread
From: Maxim Cournoyer @ 2023-09-06 0:42 UTC (permalink / raw)
To: dan; +Cc: 64421-done
Hi Dan!
dan <i@dan.games> writes:
> [version]: Temporarily change the version to a git-version.
> [source]: Fetch source from git, use newer commit to fix cross-build.
> [arguments]<#:make-flags>: Set HOSTCC to gcc.
Looks good, installed!
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-06 0:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-02 13:35 [bug#64421] [PATCH] gnu: efivar: Fix cross-compilation dan
2023-07-02 13:44 ` [bug#64421] [PATCH v2] " dan
2023-09-06 0:42 ` bug#64421: [PATCH] " Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).