update to 8.2

This commit is contained in:
ziyangc 2023-01-31 16:27:23 +08:00
parent dbd87809b5
commit f1f64c0a57
4 changed files with 6 additions and 47 deletions

View File

@ -1,43 +0,0 @@
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 5a3f977..e51f7c4 100644
--- a/support/shobj-conf
+++ b/support/shobj-conf
@@ -126,10 +126,11 @@ sunos5*|solaris2*)
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*)
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'
;;
# Darwin/MacOS X
--
1.9.3

Binary file not shown.

BIN
readline-8.2.tar.gz Normal file

Binary file not shown.

View File

@ -1,14 +1,12 @@
Name: readline Name: readline
Version: 8.1 Version: 8.2
Release: 2 Release: 1
Summary: Readline library for editing typed command lines Summary: Readline library for editing typed command lines
License: GPLv3+ License: GPLv3+
URL: http://tiswww.case.edu/php/chet/readline/rltop.html URL: http://tiswww.case.edu/php/chet/readline/rltop.html
Source0: http://git.savannah.gnu.org/cgit/readline.git/snapshot/%{name}-%{version}.tar.gz Source0: http://git.savannah.gnu.org/cgit/readline.git/snapshot/%{name}-%{version}.tar.gz
Patch0: readline-8.0-shlib.patch
BuildRequires: gcc gcc-c++ ncurses-devel BuildRequires: gcc gcc-c++ ncurses-devel
%description %description
@ -66,6 +64,7 @@ export CPPFLAGS="-I%{_includedir}/ncurses"
%{_libdir}/libhistory.so %{_libdir}/libhistory.so
%{_libdir}/libreadline.so %{_libdir}/libreadline.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/history.pc
%{_docdir}/%{name}/* %{_docdir}/%{name}/*
%{_datadir}/%{name} %{_datadir}/%{name}
%{_libdir}/*.a %{_libdir}/*.a
@ -79,6 +78,9 @@ export CPPFLAGS="-I%{_includedir}/ncurses"
%changelog %changelog
* Tue Jan 31 2023 chenziyang <chenziyang4@huawei.com> - 8.2-1
- update to 8.2
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 8.1-2 * Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 8.1-2
- rebuild for next release - rebuild for next release