-
-
Notifications
You must be signed in to change notification settings - Fork 419
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit updates our CI to test using Alpine 3.20 for musl testing. It also updates our release and nightly alpine ponyc images to be based on Alpine 3.20. Due to a change in the version of musl in Alpine 3.20, this required a small patch LLVM 15 to compile. When we move to LLVM 16 or above, the patch shouldn't be needed.
- Loading branch information
1 parent
0b8ac49
commit c28bd29
Showing
12 changed files
with
110 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM alpine:3.18 | ||
| FROM alpine:3.20 | ||
|
|
||
| ENV PATH "/root/.local/share/ponyup/bin:$PATH" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM alpine:3.18 | ||
| FROM alpine:3.20 | ||
|
|
||
| ENV PATH "/root/.local/share/ponyup/bin:$PATH" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ## Update Pony musl Docker images to Alpine 3.20 | ||
|
|
||
| We've updated our `ponylang/ponyc:latest-alpine`, `ponylang/ponyc:release-alpine`, and `ponylang/ponyc:x.y.z-alpine` images to be based on Alpine 3.20. Previously, we were using Alpine 3.18 as the base. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake | ||
| index 7e657fd15..54cd1f0d6 100644 | ||
| --- a/llvm/cmake/config-ix.cmake | ||
| +++ b/llvm/cmake/config-ix.cmake | ||
| @@ -284,9 +284,6 @@ check_symbol_exists(futimes sys/time.h HAVE_FUTIMES) | ||
| if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) | ||
| check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) | ||
| endif() | ||
| -set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") | ||
| -check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) | ||
| -set(CMAKE_REQUIRED_DEFINITIONS "") | ||
| check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) | ||
| check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) | ||
| check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2) | ||
| @@ -350,6 +347,11 @@ check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC) | ||
| if( LLVM_USING_GLIBC ) | ||
| add_definitions( -D_GNU_SOURCE ) | ||
| list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE") | ||
| + # enable 64bit off_t on 32bit systems using glibc | ||
| + if (CMAKE_SIZEOF_VOID_P EQUAL 4) | ||
| + add_compile_definitions(_FILE_OFFSET_BITS=64) | ||
| + list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") | ||
| + endif() | ||
| endif() | ||
| # This check requires _GNU_SOURCE | ||
| if (NOT PURE_WINDOWS) | ||
| diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake | ||
| index 21ce3a94a..d551ebad5 100644 | ||
| --- a/llvm/include/llvm/Config/config.h.cmake | ||
| +++ b/llvm/include/llvm/Config/config.h.cmake | ||
| @@ -128,9 +128,6 @@ | ||
| /* Define to 1 if you have the <link.h> header file. */ | ||
| #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} | ||
|
|
||
| -/* Define to 1 if you have the `lseek64' function. */ | ||
| -#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} | ||
| - | ||
| /* Define to 1 if you have the <mach/mach.h> header file. */ | ||
| #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} | ||
|
|
||
| diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp | ||
| index 651949ad5..0bc71812c 100644 | ||
| --- a/llvm/lib/Support/raw_ostream.cpp | ||
| +++ b/llvm/lib/Support/raw_ostream.cpp | ||
| @@ -804,8 +804,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) { | ||
| flush(); | ||
| #ifdef _WIN32 | ||
| pos = ::_lseeki64(FD, off, SEEK_SET); | ||
| -#elif defined(HAVE_LSEEK64) | ||
| - pos = ::lseek64(FD, off, SEEK_SET); | ||
| #else | ||
| pos = ::lseek(FD, off, SEEK_SET); | ||
| #endif | ||
| diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | ||
| index 897364f00..e4f49e5e2 100644 | ||
| --- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | ||
| +++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | ||
| @@ -139,7 +139,6 @@ write_cmake_config("config") { | ||
| values += [ | ||
| "HAVE_FUTIMENS=1", | ||
| "HAVE_LINK_H=1", | ||
| - "HAVE_LSEEK64=1", | ||
| "HAVE_MALLINFO=1", | ||
| "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1", | ||
| ] | ||
| @@ -147,7 +146,6 @@ write_cmake_config("config") { | ||
| values += [ | ||
| "HAVE_FUTIMENS=", | ||
| "HAVE_LINK_H=", | ||
| - "HAVE_LSEEK64=", | ||
| "HAVE_MALLINFO=", | ||
| "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=", | ||
| ] | ||
| diff --git a/utils/bazel/llvm_configs/config.h.cmake b/utils/bazel/llvm_configs/config.h.cmake | ||
| index 21ce3a94a..d551ebad5 100644 | ||
| --- a/utils/bazel/llvm_configs/config.h.cmake | ||
| +++ b/utils/bazel/llvm_configs/config.h.cmake | ||
| @@ -128,9 +128,6 @@ | ||
| /* Define to 1 if you have the <link.h> header file. */ | ||
| #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} | ||
|
|
||
| -/* Define to 1 if you have the `lseek64' function. */ | ||
| -#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} | ||
| - | ||
| /* Define to 1 if you have the <mach/mach.h> header file. */ | ||
| #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters