From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkz7h-0005Yg-VL for guix-patches@gnu.org; Thu, 24 Aug 2017 16:53:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkz7e-0003yM-O4 for guix-patches@gnu.org; Thu, 24 Aug 2017 16:53:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44561) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dkz7e-0003y8-Jm for guix-patches@gnu.org; Thu, 24 Aug 2017 16:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dkz7d-00042f-Nk for guix-patches@gnu.org; Thu, 24 Aug 2017 16:53:01 -0400 Subject: [bug#28226] Build go with gccgo Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkz6X-0005VD-4Y for guix-patches@gnu.org; Thu, 24 Aug 2017 16:51:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkz6T-0003Qf-PV for guix-patches@gnu.org; Thu, 24 Aug 2017 16:51:53 -0400 Received: from flashner.co.il ([178.62.234.194]:56645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkz6T-0003QH-DM for guix-patches@gnu.org; Thu, 24 Aug 2017 16:51:49 -0400 Received: from localhost (46-117-130-79.bb.netvision.net.il [46.117.130.79]) by flashner.co.il (Postfix) with ESMTPSA id 9DE7640221 for ; Thu, 24 Aug 2017 20:51:47 +0000 (UTC) Date: Thu, 24 Aug 2017 23:51:46 +0300 From: Efraim Flashner Message-ID: <20170824205146.GM2484@macbook42.flashner.co.il> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="XVTPT6MZt3zd/C+/" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28226@debbugs.gnu.org --XVTPT6MZt3zd/C+/ Content-Type: multipart/mixed; boundary="vDEbda84Uy/oId5W" Content-Disposition: inline --vDEbda84Uy/oId5W Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I need some help testing this on x86_64, I did all the building and testing on aarch64. It turns out there's a known issues in the cgo implementation that causes the test suite to fail on aarch64. With this patch set I was able to build gccgo@7 -> go@1.7 -> lfam's syncthing. --=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 --vDEbda84Uy/oId5W Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-custom-gcc-Add-flag-to-optionally-not-remove-con.patch" Content-Transfer-Encoding: quoted-printable =46rom 83bfb82f4da6fb23d3b64c7e23f9db001c85b283 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Mon, 7 Aug 2017 22:56:57 +0300 Subject: [PATCH 1/3] gnu: custom-gcc: Add flag to optionally not remove conflicting files. * gnu/packages/gcc.scm (custom-gcc): Add flag to optionally keep the files that would conflict with gcc. --- gnu/packages/gcc.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index bb8570bec..a22bb3c25 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -485,7 +485,8 @@ using compilers other than GCC." (define* (custom-gcc gcc name languages #:optional (search-paths (package-native-search-paths gcc)) - #:key (separate-lib-output? #t)) + #:key (separate-lib-output? #t) + (remove-conflicting-files? #t)) "Return a custom version of GCC that supports LANGUAGES. Use SEARCH-PAT= HS as the 'native-search-paths' field." (package (inherit gcc) @@ -508,12 +509,14 @@ as the 'native-search-paths' field." ,flags))) ((#:phases phases) `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files + ,@(if remove-conflicting-files? + `((add-after 'install 'remove-broken-or-conflicting-files (lambda* (#:key outputs #:allow-other-keys) (for-each delete-file (find-files (string-append (assoc-ref outputs "ou= t") "/bin") ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc.*)")) - #t)))))))) + #t))) + '()))))))) =20 (define %generic-search-paths ;; This is the language-neutral search path for GCC. Entries in $CPATH = are --=20 2.14.0 --vDEbda84Uy/oId5W Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-Add-gccgo-7.patch" Content-Transfer-Encoding: quoted-printable =46rom fbdf746826b308a9d23644fbb5bea93dee5e85e9 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Mon, 7 Aug 2017 22:59:22 +0300 Subject: [PATCH 2/3] gnu: Add gccgo@7. * gnu/packages/gcc.scm (gccgo@7): New variable. * gnu/packages/gcc.scm (gcc@7)[source]: Add patch. * gnu/packages/patches/gcc-7.1-go-runpath.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 15 ++++++++++++++- gnu/packages/patches/gcc-7.1-go-runpath.patch | 10 ++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcc-7.1-go-runpath.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8c00b0020..ee9429770 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -623,6 +623,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/gcc-5-source-date-epoch-2.patch \ %D%/packages/patches/gcc-6-arm-none-eabi-multilib.patch \ %D%/packages/patches/gcc-6-cross-environment-variables.patch \ + %D%/packages/patches/gcc-7.1-go-runpath.patch \ %D%/packages/patches/gcr-disable-failing-tests.patch \ %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \ %D%/packages/patches/gdk-pixbuf-list-dir.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a22bb3c25..9cf347f76 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -414,7 +414,8 @@ Go. It also includes runtime support libraries for the= se languages.") (base32 "05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca")) (patches (search-patches "gcc-strmov-store-file-names.patch" - "gcc-5.0-libvtv-runpath.patch")))))) + "gcc-5.0-libvtv-runpath.patch" + "gcc-7.1-go-runpath.patch")))))) =20 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions and the gfortran definition @@ -565,6 +566,18 @@ as the 'native-search-paths' field." ;; a cyclic dependency. #:separate-lib-output? #f)) =20 +(define-public gccgo-7 + (custom-gcc gcc-7 "gccgo" '("go") + %generic-search-paths + ;; Suppress the separate "lib" output, because otherwise the + ;; "lib" and "out" outputs would refer to each other, creati= ng + ;; a cyclic dependency. + #:separate-lib-output? #f + ;; When building go, it is expected to use the same GCC outp= ut + ;; for gcc and for gccgo, so we compile go with the gcc from + ;; this build. + #:remove-conflicting-files? #f)) + (define-public gcc-objc-4.8 (custom-gcc gcc-4.8 "gcc-objc" '("objc") (list (search-path-specification diff --git a/gnu/packages/patches/gcc-7.1-go-runpath.patch b/gnu/packages/p= atches/gcc-7.1-go-runpath.patch new file mode 100644 index 000000000..d7d91301e --- /dev/null +++ b/gnu/packages/patches/gcc-7.1-go-runpath.patch @@ -0,0 +1,10 @@ +--- gcc-7.1.0/gotools/Makefile.in ++++ gcc-7.1.0/gotools/Makefile.in +@@ -258,6 +258,6 @@ + # Use the compiler we just built. + @NATIVE_TRUE@GOCOMPILER =3D $(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) + GOCOMPILE =3D $(GOCOMPILER) $(GOCFLAGS) +-AM_LDFLAGS =3D -L $(libgodir) -L $(libgodir)/.libs ++AM_LDFLAGS =3D -Wl,-rpath=3D$(libdir) -L $(libgodir) -L $(libgodir)/.libs + GOLINK =3D $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLA= GS) -o $@ + cmdsrcdir =3D $(srcdir)/../libgo/go/cmd --=20 2.14.0 --vDEbda84Uy/oId5W Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-gnu-go-Build-with-gccgo-7.patch" Content-Transfer-Encoding: quoted-printable =46rom 5b3e3ed9e8fddb36b7d884ab5d2dd6f0a4ad5220 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Mon, 7 Aug 2017 23:09:29 +0300 Subject: [PATCH 3/3] gnu: go: Build with gccgo@7. * gnu/packages/golang.scm (go@1.8)[inputs]: Remove gcc-lib. [native-inputs]: Remove go@1.4, add gccgo@7. --- gnu/packages/golang.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 70cae6d87..3dee1d72b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2016 Efraim Flashner +;;; Copyright =C2=A9 2016, 2017 Efraim Flashner ;;; Copyright =C2=A9 2016 Matthew Jordan ;;; Copyright =C2=A9 2016 Andy Wingo ;;; Copyright =C2=A9 2016 Ludovic Court=C3=A8s @@ -219,7 +219,7 @@ sequential processes (CSP) concurrent programming featu= res added.") (replace 'prebuild ;; TODO: Most of this could be factorized with Go 1.4. (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") = "/lib")) + (let* ((gcclib (string-append (assoc-ref inputs "go") "/lib= ")) (ld (string-append (assoc-ref inputs "libc") "/lib")) (loader (car (find-files ld "^ld-linux.+"))) (net-base (assoc-ref inputs "net-base")) @@ -362,8 +362,11 @@ sequential processes (CSP) concurrent programming feat= ures added.") "LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt")) =20 (copy-recursively "../" output)))))))) + (inputs + `(("tzdata" ,tzdata) + ("pcre" ,pcre))) (native-inputs - `(("go" ,go-1.4) + `(("go" ,gccgo-7) ,@(package-native-inputs go-1.4))))) =20 (define-public go go-1.8) --=20 2.14.0 --vDEbda84Uy/oId5W-- --XVTPT6MZt3zd/C+/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlmfPGIACgkQQarn3Mo9 g1GXrQ//ZsnEc7Cl7lADz0ftcF6d58A3rMa47VTZk0QozNnHjH0eeoUNpMcTeLct IXqOSYvg9TCNWSpn0RV3uvJyYqL/cAXQ3urR46WlxWLWoPcTbsCSBRk63Ib6Cvin 74r2kp1fllyLoVX9tJX18uH4jbBZ9DBqeywTkLdj0XQuKMb3ms22fMaxX/jn/81c DPSKUKK2fQQFaeVKeDyPDEMPlwzdKEQj1nWTSvAUXofWFbvUARKhoHkvS/E42+cF n5MtirsX61BcELhm7s3M9R/lGlpjfxZj9UO+QcvA811LsqetuzLnFUqAgYAmMyU9 lg7owSKKfe7Z58w041HIMqsq9KlXtW7ua2RI7K+dEfbp5btrOhLxMHfsZnocLZxz mqZw8S4IPqua+6Z0hUSdAmQKcJHhlyybW0B2FKudeFBQC2aPPrzI019QTata9rxD sVubl+JxNG9uKcpNANKtfcP0huO6OcETOEk+d+RHR8O/QB7bbbx9Obr/Qee6EbBC MxzWM4WXmTE48/od8UWQr8Si2nqk6hEvL/nymiYA+2GZCxPxv9T5dgRx1CcwdeSV 07kIX8N86L5s5uxUN1CuDMMnGBUQ1qncACyj6kJ2JdflUf3ejudPNTnxUyWwELex PbWNUFFu2G1G9GeAkguooW+uXLgsDuhhyXLvB4hmEgHsZ6+Gjo8= =D0HC -----END PGP SIGNATURE----- --XVTPT6MZt3zd/C+/--