Skip to content

Commit 7b8ff31

Browse files
committed
Downgrade to musl 1.2.2
This is what it is available on ubuntu-22.04
1 parent 94cadca commit 7b8ff31

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

cpython-unix/build-musl.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ pushd musl-${MUSL_VERSION}
2020
# symbol dependencies on clients using an older musl version.
2121
patch -p1 <<EOF
2222
diff --git a/include/stdlib.h b/include/stdlib.h
23-
index b507ca3..8259e27 100644
23+
index b54a051f..194c2033 100644
2424
--- a/include/stdlib.h
2525
+++ b/include/stdlib.h
26-
@@ -147,7 +147,6 @@ int getloadavg(double *, int);
26+
@@ -145,7 +145,6 @@ int getloadavg(double *, int);
2727
int clearenv(void);
2828
#define WCOREDUMP(s) ((s) & 0x80)
2929
#define WIFCONTINUED(s) ((s) == 0xffff)
3030
-void *reallocarray (void *, size_t, size_t);
31-
void qsort_r (void *, size_t, size_t, int (*)(const void *, const void *, void *), void *);
3231
#endif
3332
33+
#ifdef _GNU_SOURCE
3434
diff --git a/src/malloc/reallocarray.c b/src/malloc/reallocarray.c
3535
deleted file mode 100644
36-
index 4a6ebe4..0000000
36+
index 4a6ebe46..00000000
3737
--- a/src/malloc/reallocarray.c
3838
+++ /dev/null
3939
@@ -1,13 +0,0 @@

pythonbuild/downloads.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@
220220
"license_file": "LICENSE.mpdecimal.txt",
221221
},
222222
"musl": {
223-
"url": "https://musl.libc.org/releases/musl-1.2.5.tar.gz",
224-
"size": 1080786,
225-
"sha256": "a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4",
226-
"version": "1.2.5",
223+
"url": "https://musl.libc.org/releases/musl-1.2.2.tar.gz",
224+
"size": 1055220,
225+
"sha256": "9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd",
226+
"version": "1.2.2",
227227
},
228228
"ncurses": {
229229
"url": "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.5.tar.gz",

0 commit comments

Comments
 (0)