Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/go go/bootstrap.mk: depend on lang/go-bin on {Lin...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad61dbfce4cb
branches:  trunk
changeset: 430656:ad61dbfce4cb
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat May 02 20:12:34 2020 +0000

description:
go/bootstrap.mk: depend on lang/go-bin on {Linux,NetBSD}-*-aarch64

diffstat:

 lang/go/bootstrap.mk |  19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diffs (29 lines):

diff -r 66029fd0cc28 -r ad61dbfce4cb lang/go/bootstrap.mk
--- a/lang/go/bootstrap.mk      Sat May 02 20:07:31 2020 +0000
+++ b/lang/go/bootstrap.mk      Sat May 02 20:12:34 2020 +0000
@@ -1,19 +1,12 @@
-# $NetBSD: bootstrap.mk,v 1.3 2020/05/01 16:55:28 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.4 2020/05/02 20:12:34 tnn Exp $
 
 .if !defined(GOROOT_BOOTSTRAP) || !exists(${GOROOT_BOOTSTRAP}/bin/go)
+.  if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) ||    \
+       !empty(MACHINE_PLATFORM:MLinux-*-aarch64)
+BUILD_DEPENDS+=                go-bin-[0-9]*:../../lang/go-bin
+GOROOT_BOOTSTRAP=      ${PREFIX}/go-bin
+.  else
 BUILD_DEPENDS+=                go14-1.4*:../../lang/go14
 GOROOT_BOOTSTRAP=      ${PREFIX}/go14
-
-.  if ${MACHINE_ARCH} == "aarch64"
-PKG_FAIL_REASON+=      "${MACHINE_ARCH} bootstrap toolchain missing!"
-PKG_FAIL_REASON+=      "Please read ${PKGSRCDIR}/lang/go/bootstrap.mk"
-# For now you must manually set GOROOT_BOOTSTRAP in mk.conf.
-# I've uploaded a prebuilt NetBSD/evbarm-aarch64 pkgsrc package here:
-# https://ftp.netbsd.org/pub/pkgsrc/misc/tnn/golang-aarch64/
-#
-# Also this kernel patch is needed:
-# https://netbsd.org/~tnn/uc_setstack.diff.txt
-#
 .  endif
-
 .endif



Home | Main Index | Thread Index | Old Index