[arch-commits] Commit in go/repos/community-x86_64 (3 files)

Morten Linderud foxboron at archlinux.org
Sat Nov 14 11:58:33 UTC 2020


    Date: Saturday, November 14, 2020 @ 11:58:33
  Author: foxboron
Revision: 754065

archrelease: copy trunk to community-x86_64

Added:
  go/repos/community-x86_64/PKGBUILD
    (from rev 754064, go/trunk/PKGBUILD)
  go/repos/community-x86_64/fix-ldflags.patch
    (from rev 754064, go/trunk/fix-ldflags.patch)
Deleted:
  go/repos/community-x86_64/PKGBUILD

-------------------+
 PKGBUILD          |  183 ++++++++++++++++++++++++++--------------------------
 fix-ldflags.patch |   26 +++++++
 2 files changed, 119 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-14 11:58:24 UTC (rev 754064)
+++ PKGBUILD	2020-11-14 11:58:33 UTC (rev 754065)
@@ -1,90 +0,0 @@
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Pierre Neidhardt <ambrevar at gmail.com>
-# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
-# Contributor: Rémy Oudompheng <remy at archlinux.org>
-# Contributor: Andres Perera <andres87p gmail>
-# Contributor: Matthew Bauer <mjbauer95 at gmail.com>
-# Contributor: Christian Himpel <chressie at gmail.com>
-# Contributor: Mike Rosset <mike.rosset at gmail.com>
-# Contributor: Daniel YC Lin <dlin.tw at gmail.com>
-# Contributor: John Luebs <jkluebs at gmail.com>
-
-pkgname=go
-epoch=2
-pkgver=1.15.5
-pkgrel=1
-pkgdesc='Core compiler tools for the Go programming language'
-arch=(x86_64)
-url='https://golang.org/'
-license=(BSD)
-makedepends=(git go perl)
-replaces=(go-pie)
-provides=(go-pie)
-options=(!strip staticlibs)
-source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz{,.asc}
-        "fix-color.patch::https://github.com/golang/go/commit/29634436fd741a7c685bf8f242b6fd62f093d1ad.patch")
-validpgpkeys=('EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796')
-sha256sums=('c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1'
-            'SKIP'
-            'f6bf4c18e4395bdd4925b1f15a713fa3daca0a28123d6c20d51234d7ce2d3357')
-
-prepare() {
-    cd "${pkgname}"
-    patch -Np1 < "$srcdir/fix-color.patch"
-}
-
-build() {
-  export GOARCH=amd64
-  export GOROOT_FINAL=/usr/lib/go
-  export GOROOT_BOOTSTRAP=/usr/lib/go
-  export GOPATH="$srcdir/"
-  export GOROOT="$srcdir/$pkgname"
-  export GOBIN="$GOROOT/bin"
-
-  cd "$pkgname/src"
-  ./make.bash --no-clean -v
-
-  PATH="$GOBIN:$PATH" go install -v -race std
-  PATH="$GOBIN:$PATH" go install -v -buildmode=shared std
-}
-
-check() {
-  export GOARCH=amd64
-  export GOROOT_FINAL=/usr/lib/go
-  export GOROOT_BOOTSTRAP=/usr/lib/go
-  export GOROOT="$srcdir/$pkgname"
-  export GOBIN="$GOROOT/bin"
-  export PATH="$srcdir/$pkgname/bin:$PATH"
-  export GO_TEST_TIMEOUT_SCALE=2
-
-  cd $pkgname/src
-  rm os/signal/signal_cgo_test.go  # TODO: There is a bug somewhere.
-                                   # Should only affect containers
-                                   # so lets just say No.
-  ./run.bash --no-rebuild -v -v -v -k
-}
-
-package() {
-  cd "$pkgname"
-
-  install -d "$pkgdir/usr/bin" "$pkgdir/usr/lib/go" "$pkgdir/usr/share/doc/go"
-  cp -a bin pkg src lib misc api test "$pkgdir/usr/lib/go"
-  cp -r doc/* "$pkgdir/usr/share/doc/go"
-
-  ln -sf /usr/lib/go/bin/go "$pkgdir/usr/bin/go"
-  ln -sf /usr/lib/go/bin/gofmt "$pkgdir/usr/bin/gofmt"
-  ln -sf /usr/share/doc/go "$pkgdir/usr/lib/go/doc"
-
-  install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
-
-  rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap" "$pkgdir/usr/lib/go/pkg/tool/*/api"
-
-  # TODO: Figure out if really needed
-  rm -rf "$pkgdir"/usr/lib/go/pkg/obj/go-build/*
-
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim: ts=2 sw=2 et

Copied: go/repos/community-x86_64/PKGBUILD (from rev 754064, go/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-14 11:58:33 UTC (rev 754065)
@@ -0,0 +1,93 @@
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Pierre Neidhardt <ambrevar at gmail.com>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Andres Perera <andres87p gmail>
+# Contributor: Matthew Bauer <mjbauer95 at gmail.com>
+# Contributor: Christian Himpel <chressie at gmail.com>
+# Contributor: Mike Rosset <mike.rosset at gmail.com>
+# Contributor: Daniel YC Lin <dlin.tw at gmail.com>
+# Contributor: John Luebs <jkluebs at gmail.com>
+
+pkgname=go
+epoch=2
+pkgver=1.15.5
+pkgrel=2
+pkgdesc='Core compiler tools for the Go programming language'
+arch=(x86_64)
+url='https://golang.org/'
+license=(BSD)
+makedepends=(git go perl)
+replaces=(go-pie)
+provides=(go-pie)
+options=(!strip staticlibs)
+source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz{,.asc}
+        "fix-color.patch::https://github.com/golang/go/commit/29634436fd741a7c685bf8f242b6fd62f093d1ad.patch"
+        "fix-ldflags.patch")
+validpgpkeys=('EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796')
+sha256sums=('c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1'
+            'SKIP'
+            'f6bf4c18e4395bdd4925b1f15a713fa3daca0a28123d6c20d51234d7ce2d3357'
+            '57793df3095606f930b95c8b40deca6a0c9dbc3b3fcc491ad77a91c01f67c12e')
+
+prepare() {
+    cd "${pkgname}"
+    patch -Np1 < "$srcdir/fix-color.patch"
+    patch -Np1 < "$srcdir/fix-ldflags.patch"
+}
+
+build() {
+  export GOARCH=amd64
+  export GOROOT_FINAL=/usr/lib/go
+  export GOROOT_BOOTSTRAP=/usr/lib/go
+  export GOPATH="$srcdir/"
+  export GOROOT="$srcdir/$pkgname"
+  export GOBIN="$GOROOT/bin"
+
+  cd "$pkgname/src"
+  ./make.bash --no-clean -v
+
+  PATH="$GOBIN:$PATH" go install -v -race std
+  PATH="$GOBIN:$PATH" go install -v -buildmode=shared std
+}
+
+check() {
+  export GOARCH=amd64
+  export GOROOT_FINAL=/usr/lib/go
+  export GOROOT_BOOTSTRAP=/usr/lib/go
+  export GOROOT="$srcdir/$pkgname"
+  export GOBIN="$GOROOT/bin"
+  export PATH="$srcdir/$pkgname/bin:$PATH"
+  export GO_TEST_TIMEOUT_SCALE=2
+
+  cd $pkgname/src
+  rm os/signal/signal_cgo_test.go  # TODO: There is a bug somewhere.
+                                   # Should only affect containers
+                                   # so lets just say No.
+  ./run.bash --no-rebuild -v -v -v -k
+}
+
+package() {
+  cd "$pkgname"
+
+  install -d "$pkgdir/usr/bin" "$pkgdir/usr/lib/go" "$pkgdir/usr/share/doc/go"
+  cp -a bin pkg src lib misc api test "$pkgdir/usr/lib/go"
+  cp -r doc/* "$pkgdir/usr/share/doc/go"
+
+  ln -sf /usr/lib/go/bin/go "$pkgdir/usr/bin/go"
+  ln -sf /usr/lib/go/bin/gofmt "$pkgdir/usr/bin/gofmt"
+  ln -sf /usr/share/doc/go "$pkgdir/usr/lib/go/doc"
+
+  install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
+
+  rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap" "$pkgdir/usr/lib/go/pkg/tool/*/api"
+
+  # TODO: Figure out if really needed
+  rm -rf "$pkgdir"/usr/lib/go/pkg/obj/go-build/*
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim: ts=2 sw=2 et

Copied: go/repos/community-x86_64/fix-ldflags.patch (from rev 754064, go/trunk/fix-ldflags.patch)
===================================================================
--- fix-ldflags.patch	                        (rev 0)
+++ fix-ldflags.patch	2020-11-14 11:58:33 UTC (rev 754065)
@@ -0,0 +1,26 @@
+diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
+index 2c40a4b..157ac4c 100644
+--- a/src/cmd/go/internal/work/exec.go
++++ b/src/cmd/go/internal/work/exec.go
+@@ -2883,6 +2883,21 @@
+ 				idx = bytes.Index(src, []byte(cgoLdflag))
+ 			}
+ 		}
++
++		// We expect to find the contents of cgoLDFLAGS in flags.
++		if len(cgoLDFLAGS) > 0 {
++		outer:
++			for i := range flags {
++				for j, f := range cgoLDFLAGS {
++					if f != flags[i+j] {
++						continue outer
++					}
++				}
++				flags = append(flags[:i], flags[i+len(cgoLDFLAGS):]...)
++				break
++			}
++		}
++
+ 		if err := checkLinkerFlags("LDFLAGS", "go:cgo_ldflag", flags); err != nil {
+ 			return nil, nil, err
+ 		}


More information about the arch-commits mailing list