Skip to content

Commit 7a90441

Browse files
committed
downloads: upgrade libedit 20210910-3.1 -> 20240808-3.1
We were soft blocked on upgrading due to musl compatibility issues. It looks like these got fixed upstream. So all we had to do was refresh the configure patch and it _just worked_.
1 parent 4859cdf commit 7a90441

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

cpython-unix/build-libedit.sh

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ pushd libedit-${LIBEDIT_VERSION}
1919
# run-time. So we hack up the configure script instead.
2020
patch -p1 << "EOF"
2121
diff --git a/configure b/configure
22-
index 26dd8d0..4b6d47c 100755
22+
index 614795f..4671f1b 100755
2323
--- a/configure
2424
+++ b/configure
25-
@@ -12921,14 +12921,14 @@ test -n "$NROFF" || NROFF="/bin/false"
26-
27-
28-
25+
@@ -14154,14 +14154,14 @@ test -n "$NROFF" || NROFF="/bin/false"
26+
27+
28+
2929
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
3030
-printf %s "checking for tgetent in -lncurses... " >&6; }
3131
-if test ${ac_cv_lib_ncurses_tgetent+y}
@@ -34,26 +34,28 @@ index 26dd8d0..4b6d47c 100755
3434
+if test ${ac_cv_lib_ncursesw_tgetent+y}
3535
then :
3636
printf %s "(cached) " >&6
37-
else $as_nop
38-
ac_check_lib_save_LIBS=$LIBS
37+
else case e in #(
38+
e) ac_check_lib_save_LIBS=$LIBS
3939
-LIBS="-lncurses $LIBS"
4040
+LIBS="-lncursesw $LIBS"
4141
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4242
/* end confdefs.h. */
43-
44-
@@ -12946,21 +12946,21 @@ return tgetent ();
43+
44+
@@ -14185,9 +14185,9 @@ return tgetent ();
4545
_ACEOF
4646
if ac_fn_c_try_link "$LINENO"
4747
then :
4848
- ac_cv_lib_ncurses_tgetent=yes
4949
+ ac_cv_lib_ncursesw_tgetent=yes
50-
else $as_nop
51-
- ac_cv_lib_ncurses_tgetent=no
52-
+ ac_cv_lib_ncursesw_tgetent=no
50+
else case e in #(
51+
- e) ac_cv_lib_ncurses_tgetent=no ;;
52+
+ e) ac_cv_lib_ncursesw_tgetent=no ;;
53+
esac
5354
fi
5455
rm -f core conftest.err conftest.$ac_objext conftest.beam \
55-
conftest$ac_exeext conftest.$ac_ext
56-
LIBS=$ac_check_lib_save_LIBS
56+
@@ -14195,13 +14195,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
57+
LIBS=$ac_check_lib_save_LIBS ;;
58+
esac
5759
fi
5860
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
5961
-printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
@@ -63,21 +65,21 @@ index 26dd8d0..4b6d47c 100755
6365
+if test "x$ac_cv_lib_ncursesw_tgetent" = xyes
6466
then :
6567
printf "%s\n" "#define HAVE_LIBNCURSES 1" >>confdefs.h
66-
68+
6769
- LIBS="-lncurses $LIBS"
6870
+ LIBS="-lncursesw $LIBS"
69-
70-
else $as_nop
71-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
72-
@@ -13089,7 +13089,7 @@ then :
71+
72+
else case e in #(
73+
e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
74+
@@ -14354,7 +14354,7 @@ then :
7375
LIBS="-ltinfo $LIBS"
74-
75-
else $as_nop
76-
- as_fn_error $? "libncurses, libcurses, libtermcap or libtinfo is required!" "$LINENO" 5
77-
+ as_fn_error $? "libncursesw, libcurses, libtermcap or libtinfo is required!" "$LINENO" 5
78-
76+
77+
else case e in #(
78+
- e) as_fn_error $? "libncurses, libcurses, libtermcap or libtinfo is required!" "$LINENO" 5
79+
+ e) as_fn_error $? "libncursesw, libcurses, libtermcap or libtinfo is required!" "$LINENO" 5
80+
;;
81+
esac
7982
fi
80-
8183
EOF
8284

8385
cflags="${EXTRA_TARGET_CFLAGS} -fPIC -I${TOOLS_PATH}/deps/include -I${TOOLS_PATH}/deps/include/ncursesw"

pythonbuild/downloads.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,11 @@
115115
"sha256": "828cb275b91268b1a3ea950d5c0c5eb076c678fdf005d517411f89cc8c3bb416",
116116
"version": "1.0.7",
117117
},
118-
# 20221009-3.1 fails to build on musl due to an includes issue.
119118
"libedit": {
120-
"url": "https://thrysoee.dk/editline/libedit-20210910-3.1.tar.gz",
121-
"size": 524722,
122-
"sha256": "6792a6a992050762edcca28ff3318cdb7de37dccf7bc30db59fcd7017eed13c5",
123-
"version": "20210910-3.1",
119+
"url": "https://thrysoee.dk/editline/libedit-20240808-3.1.tar.gz",
120+
"size": 538611,
121+
"sha256": "5f0573349d77c4a48967191cdd6634dd7aa5f6398c6a57fe037cc02696d6099f",
122+
"version": "20240808-3.1",
124123
"library_names": ["edit"],
125124
"licenses": ["BSD-3-Clause"],
126125
"license_file": "LICENSE.libedit.txt",

0 commit comments

Comments
 (0)