From 519a7c5bcbead22e6ea2d2c2341d981ef9e25c0d Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli@redhat.com>
Date: Wed, 25 Apr 2018 15:23:40 -0400
Subject: [PATCH]   Fix build failure caused by automake versioning differences
 related   to the glob changes.

  Fix testing failure due to Perl changes related to expanding paths.
---
 make-4.2.1-glob-fix-3.patch  | 15 +++++++++++++++
 make-4.2.1-test-driver.patch | 19 +++++++++++++++++++
 make.spec                    | 21 +++++++++++++++++++--
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 make-4.2.1-glob-fix-3.patch
 create mode 100644 make-4.2.1-test-driver.patch

diff --git a/make-4.2.1-glob-fix-3.patch b/make-4.2.1-glob-fix-3.patch
new file mode 100644
index 0000000..879fe50
--- /dev/null
+++ b/make-4.2.1-glob-fix-3.patch
@@ -0,0 +1,15 @@
+diff -Nrup a/configure b/configure
+--- a/configure	2018-03-18 23:53:43.991741060 -0400
++++ b/configure	2018-03-18 23:52:52.456028175 -0400
+@@ -11481,10 +11481,9 @@ else
+ #include <glob.h>
+ #include <fnmatch.h>
+ 
+-#define GLOB_INTERFACE_VERSION 1
+ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+ # include <gnu-versions.h>
+-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+    gnu glob
+ # endif
+ #endif
diff --git a/make-4.2.1-test-driver.patch b/make-4.2.1-test-driver.patch
new file mode 100644
index 0000000..e43e8ea
--- /dev/null
+++ b/make-4.2.1-test-driver.patch
@@ -0,0 +1,19 @@
+commit d9d4e06084a4c7da480bd49a3487aadf6ba77b54
+Author: Enrique Olaizola <enrique_olaizola16@hotmail.com>
+Date:   Sat May 27 14:24:33 2017 -0400
+
+    * tests/run_make_tests.pl: [SV 50902] Find Perl modules
+
+diff -Nrup a/tests/run_make_tests.pl b/tests/run_make_tests.pl
+--- a/tests/run_make_tests.pl	2016-04-04 01:38:37.000000000 -0400
++++ b/tests/run_make_tests.pl	2018-04-25 14:19:19.692178798 -0400
+@@ -58,6 +58,9 @@ if ($^O eq 'VMS')
+   *CORE::GLOBAL::rmdir = \&vms_rmdir;
+ }
+ 
++use FindBin;
++use lib "$FindBin::Bin";
++
+ require "test_driver.pl";
+ require "config-flags.pm";
+ 
diff --git a/make.spec b/make.spec
index 1c12f7a..e60a363 100644
--- a/make.spec
+++ b/make.spec
@@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users
 Name: make
 Epoch: 1
 Version: 4.2.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -30,7 +30,12 @@ Patch5: make-4.2.1-glob-fix-2.patch
 # Upstream patch: https://git.savannah.gnu.org/cgit/make.git/patch/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
 # Fixes incorrect use of glibc 2.27 glob internals.
 Patch6: make-4.2.1-glob-fix.patch
-# Unfortunately the above patches configure.ac, so:
+Patch7: make-4.2.1-glob-fix-3.patch
+
+# Perl 5.26 removed the implicit CWD in @INC. 
+Patch8: make-4.2.1-test-driver.patch
+
+# Unfortunately the glob patches configure.ac, so:
 BuildRequires: autoconf, automake
 
 Requires(post): /sbin/install-info
@@ -61,6 +66,13 @@ The make-devel package contains gnumake.h.
 rm -f tests/scripts/features/parallelism.orig
 
 %build
+# Since we made a change to configure.ac (and configure) touch
+# the files to avoid rebuild problems with automake versioning.
+# Specifically make expects 1.15 but some systems use 1.16.1.
+touch `find . -name configure`
+touch `find . -name aclocal.m4`
+touch `find . -name Makefile.in`
+
 %configure --with-guile
 make %{?_smp_mflags}
 
@@ -104,6 +116,11 @@ fi
 %{_includedir}/gnumake.h
 
 %changelog
+* Wed Apr 25 2018 Patsy Griffin Franklin <pfrankli@redhat.com> 1:4.2.1-9
+- Fix build failure caused by automake versioning differences related
+  to the glob changes.
+- Fix testing failure due to Perl changes related to expanding paths.
+
 * Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 1:4.2.1-8
 - BR: gcc, rebuild (guile)