Commit 4ae6ba4f authored by Georg Koppen's avatar Georg Koppen
Browse files

Revert "Merge remote-tracking branch 'dcf/bug_27827'"

This reverts commit 889be431, reversing
changes made to d8ce7fca.

The patch for bug 27827 leads to a busted Linux build.
parent 24e8b221
# vim: filetype=yaml sw=2 # vim: filetype=yaml sw=2
version: 1.11.1 version: 1.8.3
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
var: var:
...@@ -84,7 +84,7 @@ input_files: ...@@ -84,7 +84,7 @@ input_files:
enable: '[% c("var/windows") || c("var/osx") %]' enable: '[% c("var/windows") || c("var/osx") %]'
- URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
name: go name: go
sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6
- URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
name: go14 name: go14
sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
...@@ -30,13 +30,32 @@ cd client ...@@ -30,13 +30,32 @@ cd client
[% IF c("var/osx") -%] [% IF c("var/osx") -%]
# Without faketime, snowflake-client would contain the timestamp of the # Without faketime, snowflake-client would contain the timestamp of the
# temporary client.a file created during "go build". # temporary client.a file created during "go build".
# The -tmpdir flag overrides what would otherwise be a randomly generated [% c("var/faketime") %] go build -ldflags '-s'
# path, /tmp/go-link-RANDOMNUM/go.o.
mkdir -p /var/tmp/go-link.tmpdir
[% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir'
[% ELSE -%] [% ELSE -%]
go build -ldflags '-s' go build -ldflags '-s'
[% END -%] [% END -%]
[% IF c("var/osx") -%]
# Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0
# on Darwin embeds such paths and the issue is unsolved in upstream Go as of
# 2016-06-28:
# https://github.com/golang/go/issues/9206#issuecomment-310476743
# The two kinds of paths are ("000000000" stands for 9 random digits):
# /tmp/go-build000000000
# /tmp/go-link-000000000
# Such paths are the output of ioutil.TempDir("", "go-build") and
# ioutil.TempDir("", "go-link-").
cp -a client client.stomped
sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped
# Sanity check: make sure the file actually changed. If it did not, it could
# mean that a change in go or clang has made this step unnecessary.
if cmp client client.stomped
then
echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed."
echo "Check projects/snowflake/build"
exit 1
fi
mv -f client.stomped client
[% END -%]
cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %]
cd .. cd ..
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment