diff --git a/SOURCES/make-3.82-mixed-implicit.patch b/SOURCES/make-3.82-mixed-implicit.patch new file mode 100644 index 0000000..7fcb7f3 --- /dev/null +++ b/SOURCES/make-3.82-mixed-implicit.patch @@ -0,0 +1,23 @@ +commit 53b4a9e66800dde643d3ce7966c5193001e3f12e +Author: Paul Smith <psmith@gnu.org> +Date: Sun Oct 20 12:49:01 2013 -0400 + + * read.c (record_files): [SV 33034] Change fatal() to error() + + Allows deprecated syntax. However we don't guarantee this syntax + will continue to be legal in the future. + Change suggested by David Boyce <david.s.boyce@gmail.com> + +diff --git a/read.c b/read.c +index b3897b2..2966ebe 100644 +--- a/read.c ++++ b/read.c +@@ -2110,7 +2110,7 @@ record_files (struct nameseq *filenames, const char *pattern, + /* Reduce escaped percents. If there are any unescaped it's an error */ + name = filenames->name; + if (find_percent_cached (&name)) +- fatal (flocp, _("mixed implicit and normal rules")); ++ error (flocp, _("*** mixed implicit and normal rules: deprecated syntax")); + } + } + diff --git a/SPECS/make.spec b/SPECS/make.spec index c253ea9..f38f468 100644 --- a/SPECS/make.spec +++ b/SPECS/make.spec @@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users Name: make Epoch: 1 Version: 3.82 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.gnu.org/software/make/ @@ -70,6 +70,11 @@ Patch22: make-3.82-var.patch # In very obscure situations we may write the free token back to the pipe. Patch23: make-3.82-jobserver-tokens.patch +# BZ 1582545 +# A mix of explicit and implicit targets (in that order) in the same +# rule is no longer fatal (but still deprecated). +Patch24: make-3.82-mixed-implicit.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -107,6 +112,7 @@ makefile. %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 rm -f tests/scripts/features/parallelism.orig @@ -151,6 +157,11 @@ fi %{_infodir}/*.info* %changelog +* Wed Dec 05 2018 DJ Delorie <dj@redhat.com> - 1:3.82-24 +- Change fatal() to error() when a mix of explicit and implicit + targets (in that order) is detected. + Resolves: #1582545 + * Thu Jul 07 2016 Patsy Franklin <pfrankli@redhat.com> - 1:3.82-23 - In very obscure situations we may incorrectly write the free token back to the pipe.