update readline to 8.0

This commit is contained in:
wangchen2020 2020-05-11 18:45:45 +08:00
parent c485eca3ce
commit be1fdd7d05
3 changed files with 53 additions and 10 deletions

44
readline-8.0-shlib.patch Normal file
View File

@ -0,0 +1,44 @@
From 5f7f73a57b16ef58769004fe2f4111baf1c81690 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Mon, 21 Jul 2014 13:50:01 +0200
Subject: [PATCH] shlib
---
shlib/Makefile.in | 2 +-
support/shobj-conf | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/shlib/Makefile.in b/shlib/Makefile.in
index eb16211..3a34840 100644
--- a/shlib/Makefile.in
+++ b/shlib/Makefile.in
@@ -178,7 +178,7 @@ $(SHARED_READLINE): $(SHARED_OBJ)
$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so
$(RM) $@
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so
# Since tilde.c is shared between readline and bash, make sure we compile
# it with the right flags when it's built as part of readline
diff --git a/support/shobj-conf b/support/shobj-conf
index 1f64433..40827a4 100644
--- a/support/shobj-conf
+++ b/support/shobj-conf
@@ -126,10 +126,11 @@ sunos5*|solaris2*)
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ SHLIB_LIBS='-ltinfo'
;;
freebsd2*)
--
1.9.3

BIN
readline-8.0.tar.gz Normal file

Binary file not shown.

View File

@ -1,20 +1,15 @@
Name: readline
Version: 7.0
Release: 13
Version: 8.0
Release: 1
Summary: Readline library for editing typed command lines
License: GPLv3+
URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
Source0: http://git.savannah.gnu.org/cgit/readline.git/snapshot/%{name}-%{version}.tar.gz
Patch1: Readline-7.0-patch-1.patch
Patch2: Readline-7.0-patch-2.patch
Patch3: Readline-7.0-patch-3.patch
Patch4: Readline-7.0-patch-4.patch
Patch5: Readline-7.0-patch-5.patch
Patch6: readline-7.0-shlib.patch
Patch1: readline-8.0-shlib.patch
BuildRequires: gcc gcc-c++ ncurses-devel
BuildRequires: gcc gcc-c++ ncurses-devel readline
%description
The GNU Readline library provides a set of functions for use by
@ -52,11 +47,12 @@ Man pages and other related documents for %{name}.
%build
export CPPFLAGS="-I%{_includedir}/ncurses"
%configure
%configure --with-curses
%make_build
%install
%make_install
cp -a %{_libdir}/lib{readline,history}.so.7* %{buildroot}%{_libdir}
%ldconfig_scriptlets
@ -70,6 +66,7 @@ export CPPFLAGS="-I%{_includedir}/ncurses"
%{_includedir}/%{name}/*.h
%{_libdir}/libhistory.so
%{_libdir}/libreadline.so
%{_libdir}/pkgconfig/%{name}.pc
%{_docdir}/%{name}/*
%{_datadir}/%{name}
%{_libdir}/*.a
@ -83,5 +80,7 @@ export CPPFLAGS="-I%{_includedir}/ncurses"
%changelog
* Fri Apr 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 8.0-1
- update to 8.0-1
* Thu Aug 22 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.0-13
- Package init