Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
new readline 8.0 and checks in its spkg-configure
Browse files Browse the repository at this point in the history
  • Loading branch information
dimpase committed Apr 18, 2019
1 parent a190207 commit 33a1ae4
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 75 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/readline/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=readline-VERSION.tar.gz
sha1=d050d1ad41e876cab82e1a407258096ffbed9202
md5=7d0e4b56c577c8c12cf4f1d919d05210
cksum=931813369
sha1=d58041c2143595dc001d2777ae9a200be30198b0
md5=7e6c1f16aee3244a69aba6e438295ca3
cksum=3826776229
2 changes: 1 addition & 1 deletion build/pkgs/readline/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3.008.p0
8.0
18 changes: 0 additions & 18 deletions build/pkgs/readline/patches/0001-macports.patch

This file was deleted.

24 changes: 0 additions & 24 deletions build/pkgs/readline/patches/0002-ltinfo.patch

This file was deleted.

25 changes: 0 additions & 25 deletions build/pkgs/readline/patches/sigsetjmp.patch

This file was deleted.

16 changes: 12 additions & 4 deletions build/pkgs/readline/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
SAGE_SPKG_CONFIGURE([readline], [
dnl First try checking for readline with pkg-config
AC_REQUIRE([SAGE_SPKG_CONFIGURE_NCURSES])
AC_MSG_CHECKING([Installing ncurses? ])
if test x$sage_spkg_install_ncurses = xyes; then
AC_MSG_RESULT([Yes. Install readline as well.])
sage_spkg_install_readline=yes
else
AC_MSG_RESULT([No.])
dnl First try checking for readline with pkg-config
PKG_CHECK_MODULES([READLINE], [readline >= 6.0], [],
[AC_CHECK_HEADERS([readline/readline.h],
[dnl AC_SEARCH_LIBS([wresize], [readline], [break],
dnl [sage_spkg_install_readline=yes])
],
dnl rl_replace_line is not present in macos's readline
[AC_SEARCH_LIBS([rl_replace_line], [readline], [break],
[sage_spkg_install_readline=yes])],
[sage_spkg_install_readline=yes])],
[sage_spkg_install_readline=yes])
fi
])

0 comments on commit 33a1ae4

Please sign in to comment.