-
Notifications
You must be signed in to change notification settings - Fork 490
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Builds #2558
Conversation
@@ -93,8 +93,8 @@ | |||
|
|||
supported_builds = { | |||
'darwin': [ "amd64" ], | |||
'linux': [ "amd64", "i386", "armhf", "arm64", "armel", "static_i386", "static_amd64" ], | |||
'windows': [ "amd64", "i386" ] | |||
'linux': [ "arm64", "amd64" ], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
did arm64 before amd64 because it is more likely to fail
github.com/golang/protobuf/protoc-gen-go \ | ||
github.com/benbjohnson/tmpl \ | ||
github.com/mailru/easyjson/easyjson \ | ||
github.com/influxdata/pkg-config""") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in case the kapa has a newer version of pkg-config it wants.
@@ -382,13 +386,11 @@ def get_system_arch(): | |||
arch = os.uname()[4] | |||
if arch == "x86_64": | |||
arch = "amd64" | |||
elif arch == "386": | |||
arch = "i386" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removing 32 bit support (sorry!), because flux doesn't support 32 bit.
static = True | ||
arch = arch.replace("static_", "") | ||
build_command += "CGO_ENABLED=0 " | ||
build_command += "CGO_ENABLED=1 " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We always need cgo now.
tags += ["netgo", "osusergo", "static_build", "noasm"] | ||
elif platform == "darwin" and arch == "amd64": | ||
cc = "x86_64-apple-darwin15-clang" | ||
tags += [ "netgo", "osusergo"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't build static on mac.
|
||
if platform == "linux": | ||
if arch == "amd64": | ||
tags += ["netgo", "osusergo", "static_build"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we are defaulting to static building now, because it eliminates a whole class of problems
cc = "x86_64-apple-darwin15-clang" | ||
tags += [ "netgo", "osusergo"] | ||
elif platform == "windows" and arch == "amd64": | ||
cc = "x86_64-w64-mingw32-gcc" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While Influx doesn't officially support the windows build, it would be awesome if someone wanted to test it for me (I don't have a windows machine).
@@ -913,7 +913,7 @@ def main(args): | |||
type=str, | |||
help='Name to use for package name (when package is specified)') | |||
parser.add_argument('--arch', | |||
metavar='<amd64|i386|armhf|arm64|armel|all>', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No more 32 bit support :-(
fc740c6
to
2cb1f49
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
This is to fix the nightly builds so they can include the rust code for flux.