-
Notifications
You must be signed in to change notification settings - Fork 20.2k
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
go.mod, build: upgrade c-kzg-4844 #27907
Conversation
go.sum
Outdated
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= | ||
github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= | ||
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= |
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.
How can c-kzg affect go-conntrack? Are you sure this is correct?
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.
I just ran go mod tidy
internal/build/gotool.go
Outdated
@@ -55,7 +55,7 @@ func (g *GoToolchain) Go(command string, args ...string) *exec.Cmd { | |||
} | |||
// CKZG by default is not portable, append the necessary build flags to make | |||
// it not rely on modern CPU instructions and enable linking against | |||
tool.Env = append(tool.Env, "CGO_CFLAGS=-D__BLST_PORTABLE__") | |||
tool.Env = append(tool.Env, "CGO_CFLAGS=-std=c99 -O2 -D__BLST_PORTABLE__") |
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.
I'm adding this change as an attempt to fix this build failure: https://launchpadlibrarian.net/681424348/buildlog_ubuntu-trusty-amd64.ethereum-unstable_1.13.0+build28791+trusty_BUILDING.txt.gz
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
Not sure why, but changing |
Just FYI, a new version of c-kzg-4844 (v0.3.1) was just released: |
internal/build/gotool.go
Outdated
@@ -55,7 +55,7 @@ func (g *GoToolchain) Go(command string, args ...string) *exec.Cmd { | |||
} | |||
// CKZG by default is not portable, append the necessary build flags to make | |||
// it not rely on modern CPU instructions and enable linking against | |||
tool.Env = append(tool.Env, "CGO_CFLAGS=-D__BLST_PORTABLE__") | |||
tool.Env = append(tool.Env, "CGO_CFLAGS=-std=c11 -O2 -D__BLST_PORTABLE__") |
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.
You need to surround the values in quotation marks.
tool.Env = append(tool.Env, "CGO_CFLAGS=-std=c11 -O2 -D__BLST_PORTABLE__") | |
tool.Env = append(tool.Env, "CGO_CFLAGS=\"-std=c11 -O2 -D__BLST_PORTABLE__\"") |
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.
I don't think it's required here. The process environment is a slice of strings and everything after the first =
is the variable value. The env slice is not interpreted by shell.
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.
Oh gotcha. I didn't know that. You're right.
Submitted a different approach for fixing the Launchpad build now, just disable ckzg on Ubuntu Trusty where the build fails. |
This upgrades to the latest release of ckzg, and also attempts to fix some blst-related build errors that occur on launchpad.net.
This upgrades to the latest release of ckzg, and also attempts to fix some blst-related build errors that occur on launchpad.net.
This reverts commit 136f846.
This reverts commit 136f846.
This upgrades to the latest release of ckzg, and also attempts to fix some blst-related
build errors that occur on launchpad.net.