Better ppc64le support and minor improvements #184
Conversation
Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>
Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>
Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>
Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>
Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>
| ;; | ||
| 'x86_64' ) | ||
| LLVM_DISTRO=x86_64-linux-gnu-ubuntu-18.04 | ||
| LLVM_SHA256SUM=61582215dafafb7b576ea30cc136be92c877ba1f1c31ddbbd372d6d65622fef5 | ||
| apt-get install -y --no-install-recommends \ | ||
| google-cloud-sdk \ |
There was a problem hiding this comment.
why do we need google-cloud-sdk here? you can add this only if x86_64 and aarch64 to PACKAGES in above.
There was a problem hiding this comment.
I'm not sure whether there is a more elegant solution but I'll append the google-cloud-sdk if ARCH is x86 or arm ok?
Will look like this:
PACKAGES=(
[...]
)
if [[ "${ARCH}" == "x86_64" || "${ARCH}" == "aarch64" ]]; then
PACKAGES+=("google-cloud-sdk")
fi
I'll also add libtinfo5 in PACKAGES, then we can remove the complete apt-get install ... in the LLVM part.
Would that be fine with you?
| @@ -86,24 +75,31 @@ case $ARCH in | |||
| 'ppc64le' ) | |||
| LLVM_DISTRO=powerpc64le-linux-ubuntu-18.04 | |||
| LLVM_SHA256SUM=2d504c4920885c86b306358846178bc2232dfac83b47c3b1d05861a8162980e6 | |||
| apt-get install -y --no-install-recommends \ | |||
There was a problem hiding this comment.
this can be outside of the case statement once google-cloud-sdk handling is moved up.
There was a problem hiding this comment.
As described above I think we can remove all apt-get ... in all the LLVM part because that is then handled via PACKAGES already.
Would look like this
# Set LLVM version for each cpu architecture.
LLVM_VERSION=14.0.0
case $ARCH in
'ppc64le' )
LLVM_DISTRO=powerpc64le-linux-ubuntu-18.04
LLVM_SHA256SUM=2d504c4920885c86b306358846178bc2232dfac83b47c3b1d05861a8162980e6
;;
'x86_64' )
LLVM_DISTRO=x86_64-linux-gnu-ubuntu-18.04
LLVM_SHA256SUM=61582215dafafb7b576ea30cc136be92c877ba1f1c31ddbbd372d6d65622fef5
;;
'aarch64' )
LLVM_DISTRO=aarch64-linux-gnu
LLVM_SHA256SUM=1792badcd44066c79148ffeb1746058422cc9d838462be07e3cb19a4b724a1ee
;;
esacWould that be fine with you?
| @@ -18,7 +18,7 @@ config_env() { | |||
|
|
|||
| if [[ -z "${BUILD_TOOLS_PLATFORMS}" ]]; then | |||
| if [[ "${OS_DISTRO}" == "ubuntu" ]]; then | |||
| export BUILD_TOOLS_PLATFORMS=linux/arm64,linux/amd64 | |||
| export BUILD_TOOLS_PLATFORMS=linux/arm64,linux/amd64,linux/ppc64le | |||
There was a problem hiding this comment.
let's hold off this for now as it drastically increases image build time in CI with emulation + building tools.
There was a problem hiding this comment.
Sure - I can remove this with the next commit I'm just wondering if you don't want to have it built at all or just while this PR is not finally approved.
Thanks!
Signed-off-by: Marvin Giessing <marvin.giessing@gmail.com>
|
@lizan I've updated the PR accordingly - can you have another check? :) |
|
I'm also interested in simplifying the ppc build - is there any update on this @lizan? |
This is PR helps in improving the ppc64le build container (and minor improvement for the other archs), however the bazelisk part is not yet supported, so the correct bazel version needs to be downloaded manually.