diff options
| author | Vincent Batts <vbatts@hashbangbash.com> | 2021-05-27 11:45:01 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-05-28 07:01:58 +0700 |
| commit | 42e3b02a2f43776c8b17cc5b04a7506ba2646c07 (patch) | |
| tree | e37ee6e9b7bfd4b82bb90c4c9ccc83c4e1e4cf52 | |
| parent | 4d5ed6f0b662dbc102ad58162f84c13d38321fbf (diff) | |
| download | slackbuilds-42e3b02a2f43776c8b17cc5b04a7506ba2646c07.tar.gz | |
development/google-go-lang: fix build for x86
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/google-go-lang/google-go-lang.SlackBuild | 25 | ||||
| -rw-r--r-- | development/google-go-lang/google-go-lang.info | 6 |
2 files changed, 19 insertions, 12 deletions
diff --git a/development/google-go-lang/google-go-lang.SlackBuild b/development/google-go-lang/google-go-lang.SlackBuild index 1afff977d9..69a1fef84a 100644 --- a/development/google-go-lang/google-go-lang.SlackBuild +++ b/development/google-go-lang/google-go-lang.SlackBuild @@ -27,7 +27,7 @@ # SOFTWARE. PRGNAM=google-go-lang -VERSION=${VERSION:-1.16.3} +VERSION=${VERSION:-1.16.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -84,8 +84,21 @@ unset GOBIN GOPATH GOOS GOARCH # Not sure why, but this causes run.bash to fail --rworkman unset BASH_ENV -# gcc 5+ is go1.4 API, so we'll bootstrap with it -export GOROOT_BOOTSTRAP="/usr" +if [ "$ARCH" = "i586" ]; then + # issue with gccgo+go1.16 on x86 + # https://www.linuxquestions.org/questions/showthread.php?p=6253507 + # hopefully this is not needed forever... + tar -C $TMP -xf $CWD/go1.4-bootstrap-20171003.tar.gz + pushd $TMP/go + export GOROOT=$TMP/go + cd ./src + ./make.bash + popd + export GOROOT_BOOTSTRAP="$TMP/go" +else + # gcc 5+ is go1.4 API, so we'll bootstrap with it + export GOROOT_BOOTSTRAP="/usr" +fi # Default GOROOT is the parent directory of all.bash, # which is the current directory we're in. @@ -96,12 +109,6 @@ export GOROOT="$(pwd)" # The value of GOROOT once the package is installed export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go${VERSION}/go" -if [ "$ARCH" = "i586" ]; then - export GO386="softfloat" -elif [ "$ARCH" = "i686" ]; then - export GO386="softfloat" -fi - cd src if [ "x${RUN_TEST}" = "xtrue" ] ; then diff --git a/development/google-go-lang/google-go-lang.info b/development/google-go-lang/google-go-lang.info index a4943b4624..e2fdf47b66 100644 --- a/development/google-go-lang/google-go-lang.info +++ b/development/google-go-lang/google-go-lang.info @@ -1,8 +1,8 @@ PRGNAM="google-go-lang" -VERSION="1.16.3" +VERSION="1.16.4" HOMEPAGE="http://golang.org" -DOWNLOAD="https://storage.googleapis.com/golang/go1.16.3.src.tar.gz" -MD5SUM="48183a40d6522f1ea59b7d63377b7072" +DOWNLOAD="https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz https://storage.googleapis.com/golang/go1.16.4.src.tar.gz" +MD5SUM="dbf727a4b0e365bf88d97cbfde590016 5884a4cb49067b9bcf6e69a1ef44259c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |