[arch-commits] Commit in go/repos/extra-x86_64 (4 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sun Dec 10 14:22:18 UTC 2017


    Date: Sunday, December 10, 2017 @ 14:22:17
  Author: bpiotrowski
Revision: 312048

archrelease: copy trunk to extra-x86_64

Added:
  go/repos/extra-x86_64/PKGBUILD
    (from rev 312047, go/trunk/PKGBUILD)
  go/repos/extra-x86_64/default-buildmode-pie.patch
    (from rev 312047, go/trunk/default-buildmode-pie.patch)
Deleted:
  go/repos/extra-x86_64/PKGBUILD
  go/repos/extra-x86_64/default-buildmode-pie.patch

-----------------------------+
 PKGBUILD                    |  181 +++++++++++++++++++++---------------------
 default-buildmode-pie.patch |   28 +++---
 2 files changed, 106 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-10 14:22:08 UTC (rev 312047)
+++ PKGBUILD	2017-12-10 14:22:17 UTC (rev 312048)
@@ -1,89 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgbase=go
-pkgname=(go go-pie)
-epoch=2
-pkgver=1.9.2
-pkgrel=2
-arch=(i686 x86_64)
-url='http://golang.org/'
-license=(BSD)
-makedepends=(git go)
-options=(!strip staticlibs)
-_commit=2ea7d3461bb41d0ae12b56ee52d43314bcdb97f9  # tags/go1.9.2
-source=(git+https://go.googlesource.com/go#commit=$_commit
-        default-buildmode-pie.patch)
-md5sums=('SKIP'
-         '4feaf3d9028fff473d5a365389ced4c9')
-
-export GOOS=linux
-case "$CARCH" in
-  x86_64) export GOARCH=amd64 ;;
-  i686) export GOARCH=386 GO386=387 ;;
-esac
-export GOROOT_FINAL=/usr/lib/go
-export GOROOT_BOOTSTRAP=/usr/lib/go
-
-prepare() {
-  cp -r $pkgbase ${pkgbase}-pie
-
-  cd ${pkgbase}-pie
-  patch -p1 -i "$srcdir"/default-buildmode-pie.patch
-}
-
-build() {
-  export GOBIN="$GOROOT/bin"
-  export GOPATH="$srcdir/"
-
-  for _pkgname in ${pkgname[@]}; do
-    export GOROOT="$srcdir/$_pkgname"
-    cd "$srcdir/$_pkgname/src"
-    ./make.bash --no-clean
-  done
-}
-
-check() {
-  # Run test suite only for unpatched Go as it expects non-PIE ldBuildmode
-  export GOROOT="$srcdir/$pkgbase"
-  export GOBIN="$GOROOT/bin"
-  export PATH="$srcdir/$pkgbase/bin:$PATH"
-  export GO_TEST_TIMEOUT_SCALE=2
-
-  cd $pkgbase/src
-  ./run.bash --no-rebuild -v -v -v -k 
-}
-
-_package() {
-  cd "$srcdir/$1"
-
-  install -d "$pkgdir/usr/bin" "$pkgdir/usr/lib/go" "$pkgdir/usr/share/doc/go"
-  cp -a bin pkg src lib misc "$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 LICENSE "$pkgdir/usr/share/licenses/go/LICENSE"
-  install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
-
-  rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap"
-  rm -rf "$pkgdir/usr/lib/go/pkg/tool/*/api"
-}
-
-package_go() {
-  pkgdesc='Core compiler tools for the Go programming language'
-  provides=(go-pie)
-  conflicts=(go-pie)
-
-  _package $pkgname
-}
-
-package_go-pie() {
-  pkgdesc='Core compiler tools for the Go programming language (with PIE enabled by default)'
-  provides=(go)
-  conflicts=(go)
-
-  _package $pkgname
-}

Copied: go/repos/extra-x86_64/PKGBUILD (from rev 312047, go/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-10 14:22:17 UTC (rev 312048)
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=go
+pkgname=(go go-pie)
+epoch=2
+pkgver=1.9.2
+pkgrel=3
+arch=(x86_64)
+url='http://golang.org/'
+license=(BSD)
+makedepends=(git go)
+source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz
+        default-buildmode-pie.patch)
+sha256sums=('665f184bf8ac89986cfd5a4460736976f60b57df6b320ad71ad4cef53bb143dc'
+            'fd0055504e4175c1f444816636dfb53fc0ddee991fa2696bb64b087130bba96d')
+
+export GOOS=linux
+case "$CARCH" in
+  x86_64) export GOARCH=amd64 ;;
+  i686) export GOARCH=386 GO386=387 ;;
+esac
+export GOROOT_FINAL=/usr/lib/go
+export GOROOT_BOOTSTRAP=/usr/lib/go
+
+prepare() {
+  cp -r $pkgbase ${pkgbase}-pie
+
+  cd ${pkgbase}-pie
+  patch -p1 -i "$srcdir"/default-buildmode-pie.patch
+}
+
+build() {
+  export GOPATH="$srcdir/"
+
+  for _pkgname in ${pkgname[@]}; do
+    export GOROOT="$srcdir/$_pkgname"
+    export GOBIN="$GOROOT/bin"
+
+    cd "$srcdir/$_pkgname/src"
+    ./make.bash --no-clean
+
+    PATH="$GOBIN:$PATH" go install -buildmode=shared std
+    PATH="$GOBIN:$PATH" go install -race std
+  done
+}
+
+check() {
+  # Run test suite only for unpatched Go as it expects non-PIE ldBuildmode
+  export GOROOT="$srcdir/$pkgbase"
+  export GOBIN="$GOROOT/bin"
+  export PATH="$srcdir/$pkgbase/bin:$PATH"
+  export GO_TEST_TIMEOUT_SCALE=2
+
+  cd $pkgbase/src
+  ./run.bash --no-rebuild -v -v -v -k 
+}
+
+_package() {
+  options=(!strip staticlibs)
+  cd "$srcdir/$1"
+
+  install -d "$pkgdir/usr/bin" "$pkgdir/usr/lib/go" "$pkgdir/usr/share/doc/go"
+  cp -a bin pkg src lib misc "$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 LICENSE "$pkgdir/usr/share/licenses/go/LICENSE"
+  install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
+
+  rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap"
+  rm -rf "$pkgdir/usr/lib/go/pkg/tool/*/api"
+}
+
+package_go() {
+  pkgdesc='Core compiler tools for the Go programming language'
+  provides=(go-pie)
+  conflicts=(go-pie)
+
+  _package $pkgname
+}
+
+package_go-pie() {
+  pkgdesc='Core compiler tools for the Go programming language (with PIE enabled by default)'
+  provides=(go)
+  conflicts=(go)
+
+  _package $pkgname
+}

Deleted: default-buildmode-pie.patch
===================================================================
--- default-buildmode-pie.patch	2017-12-10 14:22:08 UTC (rev 312047)
+++ default-buildmode-pie.patch	2017-12-10 14:22:17 UTC (rev 312048)
@@ -1,14 +0,0 @@
-diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go
-index 9a1204866e..8b41832ae2 100644
---- a/src/cmd/go/internal/work/build.go
-+++ b/src/cmd/go/internal/work/build.go
-@@ -304,7 +304,8 @@ func BuildModeInit() {
- 		ldBuildmode = "c-shared"
- 	case "default":
- 		switch platform {
--		case "android/arm", "android/arm64", "android/amd64", "android/386":
-+		case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le",
-+			"android/arm", "android/arm64", "android/amd64", "android/386":
- 			codegenArg = "-shared"
- 			ldBuildmode = "pie"
- 		case "darwin/arm", "darwin/arm64":

Copied: go/repos/extra-x86_64/default-buildmode-pie.patch (from rev 312047, go/trunk/default-buildmode-pie.patch)
===================================================================
--- default-buildmode-pie.patch	                        (rev 0)
+++ default-buildmode-pie.patch	2017-12-10 14:22:17 UTC (rev 312048)
@@ -0,0 +1,14 @@
+diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go
+index 9a1204866e..8b41832ae2 100644
+--- a/src/cmd/go/internal/work/build.go
++++ b/src/cmd/go/internal/work/build.go
+@@ -304,7 +304,8 @@ func BuildModeInit() {
+ 		ldBuildmode = "c-shared"
+ 	case "default":
+ 		switch platform {
+-		case "android/arm", "android/arm64", "android/amd64", "android/386":
++		case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le",
++			"android/arm", "android/arm64", "android/amd64", "android/386":
+ 			codegenArg = "-shared"
+ 			ldBuildmode = "pie"
+ 		case "darwin/arm", "darwin/arm64":



More information about the arch-commits mailing list