From mboxrd@z Thu Jan 1 00:00:00 1970 Subject: bug#34427: [PATCH] build guile-static with guile-2.0 References: <20190211091136.GA3284@macbook41> In-Reply-To: <20190211091136.GA3284@macbook41> Resent-Message-ID: Date: Tue, 12 Feb 2019 11:17:40 +0200 From: Efraim Flashner Message-ID: <20190212091740.GB3284@macbook41> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="g7w8+K/95kPelPD2" Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+kyle=kyleam.com@gnu.org Sender: "bug-Guix" To: guix-patches@gnu.org Cc: 34427@debbugs.gnu.org List-ID: --g7w8+K/95kPelPD2 Content-Type: multipart/mixed; boundary="hYooF8G/hrfVAmum" Content-Disposition: inline --hYooF8G/hrfVAmum Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable When experimenting I found that using guile@2.0 as a base for guile-static, the resulting guile-static didn't segfault on the target architecture. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --hYooF8G/hrfVAmum Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-guile-static-Build-for-guile-2.0.patch" Content-Transfer-Encoding: quoted-printable =46rom 18035c4ec2c698f01e6324bc013a536fc036cc0a Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Mon, 11 Feb 2019 15:10:29 +0200 Subject: [PATCH 1/2] gnu: %guile-static: Build for guile@2.0. %guile-static@2.2 currently segfaults when run. * gnu/packages/make-bootstrap.scm (%guile-static): Rewrite package to use guile@2.0 as a base. --- gnu/packages/make-bootstrap.scm | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.= scm index c6002eb63a..836f24debf 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Cour= t=C3=A8s -;;; Copyright =C2=A9 2017 Efraim Flashner +;;; Copyright =C2=A9 2017, 2019 Efraim Flashner ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Mark H Weaver ;;; @@ -518,29 +518,29 @@ for `sh' in $PATH, and without nscd, and with static = NSS modules." ;; .scm and .go files relative to its installation directory, rather ;; than in hard-coded configure-time paths. (let* ((patches (cons* (search-patch "guile-relocatable.patch") - (search-patch "guile-2.2-default-utf8.patch") + (search-patch "guile-default-utf8.patch") (search-patch "guile-linux-syscalls.patch") - (origin-patches (package-source guile-2.2)))) - (source (origin (inherit (package-source guile-2.2)) + (origin-patches (package-source guile-2.0)))) + (source (origin (inherit (package-source guile-2.0)) (patches patches))) - (guile (package (inherit guile-2.2) - (name (string-append (package-name guile-2.2) "-static")) + (guile (package (inherit guile-2.0) + (name (string-append (package-name guile-2.0) "-static")) (source source) (synopsis "Statically-linked and relocatable Guile") =20 ;; Remove the 'debug' output (see above for the reason.) - (outputs (delete "debug" (package-outputs guile-2.2))) + (outputs (delete "debug" (package-outputs guile-2.0))) =20 (inputs `(("libunistring:static" ,libunistring "static") - ,@(package-inputs guile-2.2))) + ,@(package-inputs guile-2.0))) =20 (propagated-inputs `(("bdw-gc" ,libgc) ,@(alist-delete "bdw-gc" - (package-propagated-inputs guile-2.2)= ))) + (package-propagated-inputs guile-2.0)= ))) (arguments - (substitute-keyword-arguments (package-arguments guile-= 2.2) + (substitute-keyword-arguments (package-arguments guile-= 2.0) ((#:configure-flags flags '()) ;; When `configure' checks for ltdl availability, it ;; doesn't try to link using libtool, and thus fails @@ -563,7 +563,7 @@ for `sh' in $PATH, and without nscd, and with static NS= S modules." (("^guile_LDFLAGS =3D") "guile_LDFLAGS =3D -all-static") =20 - ;; Add `-ldl' *after* libguile-2.2.la. + ;; Add `-ldl' *after* libguile-2.0.la. (("^guile_LDADD =3D(.*)$" _ ldadd) (string-append "guile_LDADD =3D " (string-trim-right ldadd) @@ -591,13 +591,13 @@ for `sh' in $PATH, and without nscd, and with static = NSS modules." (out (assoc-ref %outputs "out")) (guile1 (string-append in "/bin/guile")) (guile2 (string-append out "/bin/guile"))) - (mkdir-p (string-append out "/share/guile/2.2")) - (copy-recursively (string-append in "/share/guile/2.2") - (string-append out "/share/guile/2.2")) + (mkdir-p (string-append out "/share/guile/2.0")) + (copy-recursively (string-append in "/share/guile/2.0") + (string-append out "/share/guile/2.0")) =20 - (mkdir-p (string-append out "/lib/guile/2.2/ccache")) - (copy-recursively (string-append in "/lib/guile/2.2/ccache") - (string-append out "/lib/guile/2.2/ccache")) + (mkdir-p (string-append out "/lib/guile/2.0/ccache")) + (copy-recursively (string-append in "/lib/guile/2.0/ccache") + (string-append out "/lib/guile/2.0/ccache")) =20 (mkdir (string-append out "/bin")) (copy-file guile1 guile2) --=20 2.20.1 --hYooF8G/hrfVAmum-- --g7w8+K/95kPelPD2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlxijy4ACgkQQarn3Mo9 g1FRzBAApDrqkMANqwivufw3E8YzhhHi4owAMHX65UHLybOzVYJK3cMWJEZhp1pl TOLtgKfOkv95BA4MR5Ju/DEgwyXgg9Zc2U88PmkpK/7v0MJMAWg24ZeBiZy+p6mO hgy4F2Wz+oXKa6QsbtqWNUB/h8kS9Y/PZk2+Nk20dISwfQosrJtfZUFBPF6uh/rR MWRTl/WziLwNIbCzaqJ5DO+qYmyJp7fM6k190vPGNIGwN1id3/bn6gjwyyiqDoHH W7/jkt/YxLdxopEGVejFgNyjzcenWbkkCEBg3piGzQ6ZjetzpgDlKDttP5oHkCuJ PbKVbvSfC9sH3YiQfabcBb7Hc4nzpLuEnayKdSzht98PhHV4xAEMgv5sVbJ/oIIl 4BsUk+t+b8FVNE6rHEbt8N2yYfOwbEw6wNSeYJhtcubKYmtguLo0aZzARt1Xv9sM 1LI9p+/AtjBk0CshQqaZsKnmfx60B+nzFq8TR+wkupiV5WTYDORGj2NvCR4dTQ9Q iCYaVoa2tnn2kCqOPjxTbTXztLLi3QUZa8L2Zzq3Wb0MGie0pLXLWsd9WPhZnhNA hkSemoVDT+0H9o1KBG4DlkWRrqEElRdaCIk3f8DrPK59nLnpnlKAAvGXIWHcEXq7 nFFMKGNRHiT+gL7//OR9Mp/Zcf9cgAzpVzzNpEzB9QQVDsQSaP0= =Ztlx -----END PGP SIGNATURE----- --g7w8+K/95kPelPD2--