[Bug 1342329] New: [PATCH] Fix compiler bootstrap

[Red Hat Bugzilla]

https://bugzilla.redhat.com/show_bug.cgi?id=1342329

            Bug ID: 1342329
           Summary: [PATCH] Fix compiler bootstrap
           Product: Fedora
           Version: rawhide
         Component: golang
          Assignee: vbatts(a)redhat.com
          Reporter: walters(a)redhat.com
        QA Contact: extras-qa(a)fedoraproject.org
                CC: admiller(a)redhat.com, amurdaca(a)redhat.com,
                    golang(a)lists.fedoraproject.org, jcajka(a)redhat.com,
                    lemenkov(a)gmail.com, renich(a)woralelandia.com, s(a)shk.io,
                    vbatts(a)redhat.com



I'm trying to use rpmdistro-gitoverlay to build the fedora golang dist-git in
CentOS Atomic Host Continuous (https://ci.centos.org/job/atomic-rdgo-centos7/)

I hit a bug in the patch for the bootstrap path - this is really a patch for a
patch, but leaving polish for later.

From 75b16e09cec3d2376ed9847ae2adfc0fea3be80c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters(a)verbum.org&gt;
Date: Thu, 2 Jun 2016 14:50:57 -0400
Subject: [PATCH] Fix compiler bootstrap

---
 0001-Fix-compiler-bootstrap.patch | 46 +++++++++++++++++++++++++++++++++++++++
 golang.spec                       |  3 +++
 2 files changed, 49 insertions(+)
 create mode 100644 0001-Fix-compiler-bootstrap.patch

diff --git a/0001-Fix-compiler-bootstrap.patch
b/0001-Fix-compiler-bootstrap.patch
new file mode 100644
index 0000000..7edd6fc
--- /dev/null
+++ b/0001-Fix-compiler-bootstrap.patch
@@ -0,0 +1,46 @@
+From 46e66eca16d0fba59c430ce83f1ed3c8ee639e77 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters(a)verbum.org&gt;
+Date: Thu, 2 Jun 2016 14:46:27 -0400
+Subject: [PATCH] Fix compiler bootstrap
+
+---
+ src/make.bash | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/make.bash b/src/make.bash
+index de8995f..f127b2a 100755
+--- a/src/make.bash
++++ b/src/make.bash
+@@ -112,13 +112,13 @@ echo '##### Building Go bootstrap tool.'
+ echo cmd/dist
+ export GOROOT="$(cd .. && pwd)"
+ GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4}
+-if [ -x "$GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go" ]; then
+-    rm -f cmd/dist/dist
+-    GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH=""
"$GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go" build -o cmd/dist/dist
./cmd/dist
+-elif [ -x "$GOROOT_BOOTSTRAP/bin/go" ]; then
+-    rm -f cmd/dist/dist
+-    GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH=""
"$GOROOT_BOOTSTRAP/bin/go"
build -o cmd/dist/dist ./cmd/dist
+-else
++for gopath in "$GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go"
"$GOROOT_BOOTSTRAP/bin/go"; do
++    if test -x ${gopath}; then
++       BOOTSTRAP_COMPILER=${gopath}
++       break
++    fi
++done
++if test -z "${BOOTSTRAP_COMPILER:-}"; then
+     echo "ERROR: Cannot find
$GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go." >&2
+     echo "ERROR: or $GOROOT_BOOTSTRAP/bin/${GOHOSTOS}_${GOHOSTARCH}/go."
>&2
+     echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4."
>&2
+@@ -130,7 +130,7 @@ if [ "$GOROOT_BOOTSTRAP" == "$GOROOT" ]; then
+     exit 1
+ fi
+ rm -f cmd/dist/dist
+-GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH=""
"$GOROOT_BOOTSTRAP/bin/go" build
-o cmd/dist/dist ./cmd/dist
++GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH=""
"${BOOTSTRAP_COMPILER}" build -o
cmd/dist/dist ./cmd/dist
+ 
+ # -e doesn't propagate out of eval, so check success by hand.
+ eval $(./cmd/dist/dist env -p || echo FAIL=true)
+-- 
+1.8.3.1
+
diff --git a/golang.spec b/golang.spec
index c9ac2ff..f2b8f9f 100644
--- a/golang.spec
+++ b/golang.spec
@@ -128,6 +128,8 @@ Patch213:       go1.5beta1-disable-TestGdbPython.patch
 # later run `go test -a std`. This makes it only use the zoneinfo.zip where
needed in tests.
 Patch215:       ./go1.5-zoneinfo_testing_only.patch

+Patch300: 0001-Fix-compiler-bootstrap.patch
+
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4

@@ -249,6 +251,7 @@ Summary:        Golang shared object libraries
 %patch213 -p1

 %patch215 -p1
+%patch300 -p1

 %build
 # print out system information
-- 
1.8.3.1

-- 
You are receiving this mail because:
You are on the CC list for the bug.