Readline: bump (#5477)

This commit is contained in:
extrowerk
2020-12-10 20:38:04 +01:00
committed by GitHub
parent 7e8ed0061b
commit f3fa6c2a13
2 changed files with 17 additions and 31 deletions

View File

@@ -5,30 +5,31 @@ Subject: applying patch readline-7.0.patch
diff --git a/support/shlib-install b/support/shlib-install
index cfec3bd..33a6612 100755
index 661355d..cfd9cf1 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*)
-*linux*|freebsd*|dragonfly*)
+*linux*|freebsd*|dragonfly*|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
index 5a3f977..c34b69b 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*)
-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*)
+linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*|haiku*)
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
--
2.7.0
2.28.0

View File

@@ -13,16 +13,9 @@ 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..004}; do
eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-$i#noarchive\""
done
CHECKSUM_SHA256_001="d8e5e98933cf5756f862243c0601cb69d3667bb33f2c7b751fe4e40b2c3fd069"
CHECKSUM_SHA256_002="36b0febff1e560091ae7476026921f31b6d1dd4c918dcb7b741aa2dad1aec8f7"
CHECKSUM_SHA256_003="94ddb2210b71eb5389c7756865d60e343666dfb722c85892f8226b26bb3eeaef"
CHECKSUM_SHA256_004="b1aa3d2a40eee2dea9708229740742e649c32bb8db13535ea78f8ac15377394c"
SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz"
CHECKSUM_SHA256="f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02"
SOURCE_DIR="readline-8.1"
PATCHES="readline-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 sparc m68k"
@@ -30,8 +23,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
readline$secondaryArchSuffix = $portVersion
lib:libhistory$secondaryArchSuffix = 8.0 compat >= 8
lib:libreadline$secondaryArchSuffix = 8.0 compat >= 8
lib:libhistory$secondaryArchSuffix = 8.1 compat >= 8
lib:libreadline$secondaryArchSuffix = 8.1 compat >= 8
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -40,8 +33,8 @@ REQUIRES="
PROVIDES_devel="
readline${secondaryArchSuffix}_devel = $portVersion
devel:libhistory$secondaryArchSuffix = 8.0 compat >= 8
devel:libreadline$secondaryArchSuffix = 8.0 compat >= 8
devel:libhistory$secondaryArchSuffix = 8.1 compat >= 8
devel:libreadline$secondaryArchSuffix = 8.1 compat >= 8
"
REQUIRES_devel="
readline$secondaryArchSuffix == $portVersion base
@@ -62,16 +55,8 @@ BUILD_PREREQUIRES="
"
defineDebugInfoPackage readline$secondaryArchSuffix \
$libDir/libhistory.so.8.0 \
$libDir/libreadline.so.8.0
PATCH()
{
for i in {001..004}; do
echo "Applying patch $i..."
cat ../../sources-$i/readline80-$i | patch -p0
done
}
$libDir/libhistory.so.8.1 \
$libDir/libreadline.so.8.1
BUILD()
{