$ git show --format=fuller --patch-with-stat --summary fb8e698a2feb1fc01da3f2936b653453bfc0f686
commit fb8e698a2feb1fc01da3f2936b653453bfc0f686
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Wed Oct 9 17:00:13 2019 +0200
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Wed Oct 9 17:00:13 2019 +0200
Remove -L/usr/lib from compiler flags
---
bash-5.0-no-Lusrlib.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
bash.spec | 2 ++
2 files changed, 46 insertions(+)
create mode 100644 bash-5.0-no-Lusrlib.patch
diff --git a/bash-5.0-no-Lusrlib.patch b/bash-5.0-no-Lusrlib.patch
new file mode 100644
index 0000000..7744de0
--- /dev/null
+++ b/bash-5.0-no-Lusrlib.patch
@@ -0,0 +1,44 @@
+diff -up bash-5.0/aclocal.m4.omv~ bash-5.0/aclocal.m4
+--- bash-5.0/aclocal.m4.omv~ 2019-10-09 16:44:47.279154310 +0200
++++ bash-5.0/aclocal.m4 2019-10-09 16:45:51.881276121 +0200
+@@ -1827,8 +1827,8 @@ eval ac_cv_rl_includedir=${ac_cv_rl_pref
+ eval ac_cv_rl_libdir=${ac_cv_rl_prefix}/lib
+
+ LIBS="$LIBS -lreadline ${TERMCAP_LIB}"
+-CFLAGS="$CFLAGS -I${ac_cv_rl_includedir}"
+-LDFLAGS="$LDFLAGS -L${ac_cv_rl_libdir}"
++[ "${ac_cv_rl_prefix}" != "/usr" ] && CFLAGS="$CFLAGS -I${ac_cv_rl_includedir}"
++[ "${ac_cv_rl_prefix}" != "/usr" ] && LDFLAGS="$LDFLAGS -L${ac_cv_rl_libdir}"
+
+ AC_CACHE_VAL(ac_cv_rl_version,
+ [AC_TRY_RUN([
+diff -up bash-5.0/Makefile.in.omv~ bash-5.0/Makefile.in
+--- bash-5.0/Makefile.in.omv~ 2019-10-09 16:50:15.266772802 +0200
++++ bash-5.0/Makefile.in 2019-10-09 16:51:32.847919129 +0200
+@@ -249,7 +249,7 @@ RL_INCLUDEDIR = @RL_INCLUDEDIR@
+
+ READLINE_LIB = @READLINE_LIB@
+ READLINE_LIBRARY = $(RL_LIBDIR)/libreadline.a
+-READLINE_LDFLAGS = -L${RL_LIBDIR}
++#READLINE_LDFLAGS = -L${RL_LIBDIR}
+ READLINE_DEP = @READLINE_DEP@
+
+ # The source, object and documentation of the GNU Readline library.
+@@ -301,7 +301,7 @@ HIST_ABSSRC = ${topdir}/$(HIST_LIBDIR)
+
+ HISTORY_LIB = @HISTORY_LIB@
+ HISTORY_LIBRARY = $(HIST_LIBDIR)/libhistory.a
+-HISTORY_LDFLAGS = -L$(HIST_LIBDIR)
++#HISTORY_LDFLAGS = -L$(HIST_LIBDIR)
+ HISTORY_DEP = @HISTORY_DEP@
+
+ # The source, object and documentation of the history library.
+@@ -320,7 +320,7 @@ TERM_ABSSRC = ${topdir}/$(TERM_LIBDIR)
+
+ TERMCAP_LIB = @TERMCAP_LIB@
+ TERMCAP_LIBRARY = $(TERM_LIBDIR)/libtermcap.a
+-TERMCAP_LDFLAGS = -L$(TERM_LIBDIR)
++#TERMCAP_LDFLAGS = -L$(TERM_LIBDIR)
+ TERMCAP_DEP = @TERMCAP_DEP@
+
+ TERMCAP_SOURCE = $(TERM_LIBSRC)/termcap.c $(TERM_LIBSRC)/tparam.c
diff --git a/bash.spec b/bash.spec
index 3b26c59..b4890f6 100644
--- a/bash.spec
+++ b/bash.spec
@@ -48,6 +48,7 @@ Patch1007: bash-3.2-lzma-copmpletion.patch
Patch1009: bash-requires.patch
Patch1010: bash-ru-ua-l10n.patch
Patch1011: bash-5.0-no-internal-libc.patch
+Patch1012: bash-5.0-no-Lusrlib.patch
BuildRequires: autoconf
BuildRequires: bison
BuildRequires: groff
@@ -123,6 +124,7 @@ mv doc/README .
# Needs porting to 4.3
#patch1010 -p1 -b .ruua
%patch1011 -p1 -b .libc~
+%patch1012 -p1 -b .Lusrlib~
sed -i -e 's,^#define.*CHECKWINSIZE_DEFAULT.*,#define CHECKWINSIZE_DEFAULT 1,' config-top.h