readline: bump to 8.0.

keep readline7 for compatibility.
This commit is contained in:
Jerome Duval
2019-12-01 11:14:49 +01:00
parent 66b4d9de92
commit 72b3898fdf
4 changed files with 150 additions and 7 deletions

View File

@@ -0,0 +1,34 @@
From 9332d4a9ebdc68e524de21d9696b2f01a351142f Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 28 Jun 2017 23:33:35 +0200
Subject: applying patch readline-7.0.patch
diff --git a/support/shlib-install b/support/shlib-install
index cfec3bd..33a6612 100755
--- a/support/shlib-install
+++ b/support/shlib-install
@@ -118,7 +118,7 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2'
# Create symlinks to the installed library. This section is incomplete.
#
case "$host_os-$host_vendor" in
-*linux*|freebsd*-gentoo)
+*linux*|freebsd*-gentoo|haiku*)
# libname.so.M -> libname.so.M.N
${echo} ${RM} ${INSTALLDIR}/$LINK2
if [ -z "$uninstall" ]; then
diff --git a/support/shobj-conf b/support/shobj-conf
index 1f64433..69f0693 100644
--- a/support/shobj-conf
+++ b/support/shobj-conf
@@ -123,7 +123,7 @@ sunos5*|solaris2*)
;;
# All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd.
-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
+linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo|haiku*)
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
--
2.7.0

View File

@@ -0,0 +1,101 @@
SUMMARY="The GNU Readline library"
DESCRIPTION="The GNU Readline library provides a set of functions for use by \
applications that allow users to edit command lines as they are typed in. \
Both Emacs and vi editing modes are available. The Readline library includes \
additional functions to maintain a list of previously-entered command lines, \
to recall and perhaps reedit those lines, and perform csh-like history \
expansion on previous commands.
The history facilites are also placed into a separate library, the History \
library, as part of the build process. The History library may be used without \
Readline in applications which desire its capabilities."
HOMEPAGE="http://tiswww.case.edu/php/chet/readline/rltop.html"
COPYRIGHT="1989-2019 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz"
CHECKSUM_SHA256="e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461"
SOURCE_DIR="readline-8.0"
for i in {001..001}; do
eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-$i#noarchive\""
done
CHECKSUM_SHA256_001="d8e5e98933cf5756f862243c0601cb69d3667bb33f2c7b751fe4e40b2c3fd069"
PATCHES="readline-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 sparc"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
readline$secondaryArchSuffix = $portVersion
lib:libhistory$secondaryArchSuffix = 8.0 compat >= 8
lib:libreadline$secondaryArchSuffix = 8.0 compat >= 8
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
PROVIDES_devel="
readline${secondaryArchSuffix}_devel = $portVersion
devel:libhistory$secondaryArchSuffix = 8.0 compat >= 8
devel:libreadline$secondaryArchSuffix = 8.0 compat >= 8
"
REQUIRES_devel="
readline$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix >= 6
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage readline$secondaryArchSuffix \
$libDir/libhistory.so.8.0 \
$libDir/libreadline.so.8.0
PATCH()
{
for i in {001..001}; do
echo "Applying patch $i..."
cat ../../sources-$i/readline80-$i | patch -p0
done
}
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
runConfigure ./configure \
--with-curses
make $jobArgs SHLIB_LIBS=-lncurses
}
INSTALL()
{
make install
rm $libDir/lib*.a
mkdir -p $libDir/pkgconfig
cp $sourceDir/readline.pc $libDir/pkgconfig/
prepareInstalledDevelLibs libhistory libreadline
rmdir $binDir
fixPkgconfig
# devel package
packageEntries devel \
$dataDir \
$developDir \
$documentationDir
}

View File

@@ -12,23 +12,25 @@ Readline in applications which desire its capabilities."
HOMEPAGE="http://tiswww.case.edu/php/chet/readline/rltop.html"
COPYRIGHT="1989-2017 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="4"
REVISION="1"
SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz"
CHECKSUM_SHA256="750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334"
SOURCE_DIR="readline-7.0"
for i in {001..003}; do
for i in {001..005}; do
eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/readline/readline-7.0-patches/readline70-$i#noarchive\""
done
CHECKSUM_SHA256_001="9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376"
CHECKSUM_SHA256_002="8747c92c35d5db32eae99af66f17b384abaca961653e185677f9c9a571ed2d58"
CHECKSUM_SHA256_003="9e43aa93378c7e9f7001d8174b1beb948deefa6799b6f581673f465b7d9d4780"
CHECKSUM_SHA256_004="f925683429f20973c552bff6702c74c58c2a38ff6e5cf305a8e847119c5a6b64"
CHECKSUM_SHA256_005="ca159c83706541c6bbe39129a33d63bbd76ac594303f67e4d35678711c51b753"
PATCHES="readline-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 sparc"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
readline$secondaryArchSuffix = $portVersion compat >= 7
readline7$secondaryArchSuffix = $portVersion compat >= 7
lib:libhistory$secondaryArchSuffix = 7.0 compat >= 7
lib:libreadline$secondaryArchSuffix = 7.0 compat >= 7
"
@@ -38,12 +40,16 @@ REQUIRES="
"
PROVIDES_devel="
readline${secondaryArchSuffix}_devel = $portVersion
readline7${secondaryArchSuffix}_devel = $portVersion
devel:libhistory$secondaryArchSuffix = 7.0 compat >= 7
devel:libreadline$secondaryArchSuffix = 7.0 compat >= 7
"
REQUIRES_devel="
readline$secondaryArchSuffix == $portVersion base
readline7$secondaryArchSuffix == $portVersion base
"
CONFLICTS_devel="
readline${secondaryArchSuffix}_devel
readline6${secondaryArchSuffix}_devel
"
BUILD_REQUIRES="
@@ -60,13 +66,13 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage readline$secondaryArchSuffix \
defineDebugInfoPackage readline7$secondaryArchSuffix \
$libDir/libhistory.so.7.0 \
$libDir/libreadline.so.7.0
PATCH()
{
for i in {001..003}; do
for i in {001..005}; do
echo "Applying patch $i..."
sed -e "s/\.\.\/readline-7.0\///" ../../sources-$i/readline70-$i | patch -p0
done
@@ -86,6 +92,8 @@ INSTALL()
{
make install
rm $libDir/lib*.a
mkdir -p $libDir/pkgconfig
cp $sourceDir/readline.pc $libDir/pkgconfig/