$ git diff --patch-with-stat --summary 45867fb4218c90027ce8902e01c71cefac2f8ee5..707138b26aa6330f570923e581b64cd1d85b9df4
.abf.yml | 2 +-
gawk-5.1.0-no-Lusrlib.patch | 73 +++++++++++++++++++++++++++++++++++++++++++++
gawk.spec | 10 ++-----
3 files changed, 77 insertions(+), 8 deletions(-)
create mode 100644 gawk-5.1.0-no-Lusrlib.patch
diff --git a/.abf.yml b/.abf.yml
index bb3794f..fa98850 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- gawk-5.0.1.tar.xz: ccdad761aa1fc682d688c7095b47208bef726582
+ gawk-5.1.0.tar.xz: 02408f1be58747a0d8c16ef1d191398b4260c638
diff --git a/gawk-5.1.0-no-Lusrlib.patch b/gawk-5.1.0-no-Lusrlib.patch
new file mode 100644
index 0000000..2dd5472
--- /dev/null
+++ b/gawk-5.1.0-no-Lusrlib.patch
@@ -0,0 +1,73 @@
+diff -up gawk-5.1.0/configure.ac.omv~ gawk-5.1.0/configure.ac
+diff -up gawk-5.1.0/m4/lib-link.m4.omv~ gawk-5.1.0/m4/lib-link.m4
+--- gawk-5.1.0/m4/lib-link.m4.omv~ 2020-04-17 01:44:55.677769040 +0200
++++ gawk-5.1.0/m4/lib-link.m4 2020-04-17 01:46:49.913041223 +0200
+@@ -370,7 +370,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ fi
+ if test "X$found_dir" != "X"; then
+ dnl Found the library.
+- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ } -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+@@ -430,7 +430,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ fi
+ done
+ if test -z "$haveit"; then
+- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+@@ -457,7 +457,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ else
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ } -l$name"
+ fi
+ fi
+ dnl Assume the include files are nearby.
+@@ -558,7 +558,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LIBNAME.
+- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }"
+ fi
+ fi
+ haveit=
+@@ -572,7 +572,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }"
+ fi
+ fi
+ fi
+diff -up gawk-5.1.0/m4/mpfr.m4.omv~ gawk-5.1.0/m4/mpfr.m4
+--- gawk-5.1.0/m4/mpfr.m4.omv~ 2020-04-17 01:44:30.581489554 +0200
++++ gawk-5.1.0/m4/mpfr.m4 2020-04-17 01:44:39.925593615 +0200
+@@ -18,7 +18,7 @@ AC_DEFUN([GNUPG_CHECK_MPFR],
+ [_do_mpfr=$withval],[_do_mpfr=yes])
+
+ if test "$_do_mpfr" != "no" ; then
+- if test -d "$withval" ; then
++ if test -d "$withval" -a "$withval" != "/usr"; then
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
+ fi
+diff -up gawk-5.1.0/m4/readline.m4.omv~ gawk-5.1.0/m4/readline.m4
+--- gawk-5.1.0/m4/readline.m4.omv~ 2020-04-17 01:43:14.484642097 +0200
++++ gawk-5.1.0/m4/readline.m4 2020-04-17 01:43:40.117927565 +0200
+@@ -24,7 +24,7 @@ AC_DEFUN([GAWK_CHECK_READLINE],
+ [_do_readline=$withval],[_do_readline=yes])
+
+ if test "$_do_readline" != "no" ; then
+- if test -d "$withval" ; then
++ if test -d "$withval" -a "$withval" != "/usr" ; then
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
+ fi
diff --git a/gawk.spec b/gawk.spec
index 445309e..61adcc9 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -4,12 +4,13 @@
Summary: The GNU version of the awk text processing utility
Name: gawk
-Version: 5.0.1
+Version: 5.1.0
Release: 1
License: GPLv3+
Group: Text tools
Url: http://www.gnu.org/software/gawk/gawk.html
Source0: http://ftp.gnu.org/gnu/gawk/%{name}-%{version}.tar.xz
+Patch0: gawk-5.1.0-no-Lusrlib.patch
BuildRequires: byacc
BuildRequires: gettext-devel
BuildRequires: libsigsegv-devel >= 2.8
@@ -18,11 +19,7 @@ BuildRequires: gmp-devel
BuildRequires: readline-devel >= 7.0
BuildRequires: autoconf-archive
# For building docs
-BuildRequires: texlive-epsf
-BuildRequires: texlive
BuildRequires: texinfo
-BuildRequires: texlive-dvips
-BuildRequires: texlive-collection-latex
BuildRequires: groff
# This allows some locale specific tests to pass
BuildRequires: locales-en
@@ -63,7 +60,6 @@ sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in
%build
%define _disable_rebuild_configure 1
-
libtoolize --force
aclocal -I m4
autoheader
@@ -77,7 +73,7 @@ autoconf
--with-libsigsegv-prefix=%{_prefix}
%endif
-%make_build
+%make_build AR=llvm-ar RANLIB=llvm-ranlib
%make_build -C doc
# (tpg) seems like tests fails due to overlayfs which is used inside docker-builder