commit c960dc84fab7d50f541bba31f6573d4246363751 Author: Matt Housh <jaeger@crux.ninja> Date: Sat Aug 28 11:58:29 2021 -0500 go: tweaked/cleaned Pkgfile, a rebuild is not required diff --git a/go/.footprint b/go/.footprint index fd022bab9..2b31e6a02 100644 --- a/go/.footprint +++ b/go/.footprint @@ -5518,7 +5518,7 @@ drwxr-xr-x root/root usr/lib/go/src/go/parser/testdata/ -rw-r--r-- root/root usr/lib/go/src/go/parser/testdata/issue3106.src -rw-r--r-- root/root usr/lib/go/src/go/parser/testdata/issue34946.src drwxr-xr-x root/root usr/lib/go/src/go/parser/testdata/issue42951/ -drw-r--r-- root/root usr/lib/go/src/go/parser/testdata/issue42951/not_a_file.go/ +drwxr-xr-x root/root usr/lib/go/src/go/parser/testdata/issue42951/not_a_file.go/ -rw-r--r-- root/root usr/lib/go/src/go/parser/testdata/issue42951/not_a_file.go/invalid.go -rw-r--r-- root/root usr/lib/go/src/go/parser/testdata/issue44504.src -rw-r--r-- root/root usr/lib/go/src/go/parser/testdata/linalg.go2 diff --git a/go/.signature b/go/.signature index ffd03fec9..b3014aa5e 100644 --- a/go/.signature +++ b/go/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yd4Bis7y0ObqC6hamFc2+1X+stFx3SLMfdJozL7JA38ZIKg2nDN59dyBZO5QtD2xmngEVwLNlVsNWv5W83V0AI= -SHA256 (Pkgfile) = b1de0654fa9e150c08857495bd6f84abd0170ee4efb985d34a7cfc980eda4079 -SHA256 (.footprint) = f945069c137980e8ed4a9e5f2233d5182ebf46efe47891ec066d1cfcdb0842f5 -SHA256 (go1.4.3.linux-amd64.tar.gz) = ce3140662f45356eb78bc16a88fc7cfb29fb00e18d7c632608245b789b2086d2 +RWSagIOpLGJF379Q3V/mxwUPLtdNxDCHKUZYaSOy3FlOsB06FRPIOYxylEwNy8mTNAuxMWivspsF8R/uQxfPJWPlTewUv2JmIA4= +SHA256 (Pkgfile) = 3da8b452d3b197abe0dfe9cdeb6d9b24c0602f14046e464c2f7c6f5dbfce1820 +SHA256 (.footprint) = e4a9446b1fb411ec6e4149a74984720d5472fca7b4cb17321a17493d86f7af1b SHA256 (go1.17.src.tar.gz) = 3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d +SHA256 (go1.17.linux-amd64.tar.gz) = 6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d diff --git a/go/Pkgfile b/go/Pkgfile index 21656af7b..f01749f4e 100644 --- a/go/Pkgfile +++ b/go/Pkgfile @@ -5,37 +5,32 @@ name=go version=1.17 release=1 -source=(https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz \ - https://storage.googleapis.com/golang/${name}${version}.src.tar.gz) +source=(https://golang.org/dl/go${version}.src.tar.gz \ + https://golang.org/dl/go${version}.linux-amd64.tar.gz) unpack_source() { - install -d $SRC/go1.4 - bsdtar -xf $PKGMK_SOURCE_DIR/${name}1.4.3.linux-amd64.tar.gz \ - -C $SRC/go1.4 --strip-components 1 - bsdtar -xf $PKGMK_SOURCE_DIR/${name}${version}.src.tar.gz \ + install -d $SRC/go${version} + bsdtar -xf $PKGMK_SOURCE_DIR/go${version}.linux-amd64.tar.gz \ + -C $SRC/go${version} --strip-components=1 + bsdtar -xf $PKGMK_SOURCE_DIR/go${version}.src.tar.gz \ -C $SRC } build() { - export GOROOT_BOOTSTRAP=${SRC}/go1.4 + export GOCACHE=$SRC/go-build + export GOROOT_BOOTSTRAP=$SRC/go${version} export GOROOT_FINAL=/usr/lib/go - export GOOS=linux - export GOARCH=amd64 - export GOCACHE=off cd go/src - bash make.bash --no-clean - - rm -rf $SRC/go/pkg/obj/go-build/* + ./make.bash install -d $PKG/usr/lib - cp -r $SRC/go $PKG/usr/lib/ + mv $SRC/go $PKG/usr/lib/ install -d $PKG/usr/bin ln -s /usr/lib/go/bin/go $PKG/usr/bin/ ln -s /usr/lib/go/bin/gofmt $PKG/usr/bin/ - find $PKG \( -name "*.a" -o -name "*.go" \) -exec chmod 644 '{}' \; find $PKG \( -name "README*" -o -name "AUTHORS" -o -name "TODO" \) -delete rm $PKG/usr/lib/go/src/*.bat }