Skip to content

Commit 1aca322

Browse files
committed
downloads: upgrade libedit 20210216-3.1 to 20210714-3.1
1 parent 28a4469 commit 1aca322

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

cpython-unix/build-libedit.sh

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,65 +19,65 @@ 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 5f20ebe..eecc67a 100755
22+
index 26dd8d0..4b6d47c 100755
2323
--- a/configure
2424
+++ b/configure
25-
@@ -12448,13 +12448,13 @@ test -n "$NROFF" || NROFF="/bin/false"
26-
27-
28-
29-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
30-
-$as_echo_n "checking for tgetent in -lncurses... " >&6; }
31-
-if ${ac_cv_lib_ncurses_tgetent+:} false; then :
32-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncursesw" >&5
33-
+$as_echo_n "checking for tgetent in -lncursesw... " >&6; }
34-
+if ${ac_cv_lib_ncursesw_tgetent+:} false; then :
35-
$as_echo_n "(cached) " >&6
36-
else
25+
@@ -12921,14 +12921,14 @@ test -n "$NROFF" || NROFF="/bin/false"
26+
27+
28+
29+
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
30+
-printf %s "checking for tgetent in -lncurses... " >&6; }
31+
-if test ${ac_cv_lib_ncurses_tgetent+y}
32+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncursesw" >&5
33+
+printf %s "checking for tgetent in -lncursesw... " >&6; }
34+
+if test ${ac_cv_lib_ncursesw_tgetent+y}
35+
then :
36+
printf %s "(cached) " >&6
37+
else $as_nop
3738
ac_check_lib_save_LIBS=$LIBS
3839
-LIBS="-lncurses $LIBS"
3940
+LIBS="-lncursesw $LIBS"
4041
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4142
/* end confdefs.h. */
42-
43-
@@ -12474,22 +12474,22 @@ return tgetent ();
44-
}
43+
44+
@@ -12946,21 +12946,21 @@ return tgetent ();
4545
_ACEOF
46-
if ac_fn_c_try_link "$LINENO"; then :
46+
if ac_fn_c_try_link "$LINENO"
47+
then :
4748
- ac_cv_lib_ncurses_tgetent=yes
4849
+ ac_cv_lib_ncursesw_tgetent=yes
49-
else
50+
else $as_nop
5051
- ac_cv_lib_ncurses_tgetent=no
5152
+ ac_cv_lib_ncursesw_tgetent=no
5253
fi
53-
rm -f core conftest.err conftest.$ac_objext \
54+
rm -f core conftest.err conftest.$ac_objext conftest.beam \
5455
conftest$ac_exeext conftest.$ac_ext
5556
LIBS=$ac_check_lib_save_LIBS
5657
fi
57-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
58-
-$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
59-
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
60-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_tgetent" >&5
61-
+$as_echo "$ac_cv_lib_ncursesw_tgetent" >&6; }
62-
+if test "x$ac_cv_lib_ncursesw_tgetent" = xyes; then :
63-
cat >>confdefs.h <<_ACEOF
64-
#define HAVE_LIBNCURSES 1
65-
_ACEOF
66-
58+
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
59+
-printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
60+
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes
61+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_tgetent" >&5
62+
+printf "%s\n" "$ac_cv_lib_ncursesw_tgetent" >&6; }
63+
+if test "x$ac_cv_lib_ncursesw_tgetent" = xyes
64+
then :
65+
printf "%s\n" "#define HAVE_LIBNCURSES 1" >>confdefs.h
66+
6767
- LIBS="-lncurses $LIBS"
6868
+ LIBS="-lncursesw $LIBS"
69-
70-
else
71-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
72-
@@ -12624,7 +12624,7 @@ _ACEOF
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 :
7373
LIBS="-ltinfo $LIBS"
74-
75-
else
74+
75+
else $as_nop
7676
- as_fn_error $? "libncurses, libcurses, libtermcap or libtinfo is required!" "$LINENO" 5
7777
+ as_fn_error $? "libncursesw, libcurses, libtermcap or libtinfo is required!" "$LINENO" 5
78-
78+
7979
fi
80-
80+
8181
EOF
8282

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

pythonbuild/downloads.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@
147147
"version": "12.0.1",
148148
},
149149
"libedit": {
150-
"url": "https://thrysoee.dk/editline/libedit-20210216-3.1.tar.gz",
151-
"size": 518381,
152-
"sha256": "2283f741d2aab935c8c52c04b57bf952d02c2c02e651172f8ac811f77b1fc77a",
153-
"version": "20210216-3.1",
150+
"url": "https://thrysoee.dk/editline/libedit-20210714-3.1.tar.gz",
151+
"size": 522662,
152+
"sha256": "3023b498ad593fd7745ae3b20abad546de506b67b8fbb5579637ca69ab82dbc9",
153+
"version": "20210714-3.1",
154154
"library_names": ["edit"],
155155
"licenses": ["BSD-3-Clause"],
156156
"license_file": "LICENSE.libedit.txt",

0 commit comments

Comments
 (0)