amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into core-updates

Browse source 
Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
This commit is contained in:
Efraim Flashner 2023-01-30 11:33:18 +02:00
commit 4cf1acc7f3
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
740 changed files with 619028 additions and 314277 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/make-bootstrap.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
@ -709,6 +709,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
;; doesn't try to link using libtool, and thus fails
;; because of a missing -ldl. Work around that.
`(list "LDFLAGS=-ldl" "--enable-mini-gmp"
;; Guile does an LTO build by default, but in 3.0.9 it
;; wrongfully picks 'ar' instead of 'gcc-ar', so work around
;; it (see <https://issues.guix.gnu.org/61086>).
,@(if (version-prefix? "3.0" (package-version guile))
'("AR=gcc-ar" "RANLIB=gcc-ranlib")
'())
,@(if (hurd-target?)
'("--disable-jit")
'())))
@ -751,6 +759,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
"guile-default-utf8.patch"
"guile-linux-syscalls.patch")))
(define %guile-static-3.0
(make-guile-static guile-3.0-latest
'("guile-2.2-default-utf8.patch"
"guile-3.0-linux-syscalls.patch"
"guile-3.0-relocatable.patch")))
(define* (make-guile-static-stripped static-guile)
(package
(inherit static-guile)
@ -799,11 +813,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define %guile-static-stripped
;; A stripped static Guile 3.0 binary, for use in initrds
;; and during bootstrap.
(make-guile-static-stripped
(make-guile-static guile-3.0
'("guile-2.2-default-utf8.patch"
"guile-3.0-linux-syscalls.patch"
"guile-3.0-relocatable.patch"))))
(make-guile-static-stripped %guile-static-3.0))
(define (tarball-package pkg)
"Return a package containing a tarball of PKG."