From: David Michael <fedora.dm0@gmail.com>
Date: Fri, 13 Mar 2020 18:23:48 +0000 (-0400)
Subject: autotools.eclass: reorder sysroot M4 include dir option
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53678d996f4fda6eff08e5eeed3a518004a8e1dc;p=gentoo.git

autotools.eclass: reorder sysroot M4 include dir option

The old autoconf-2.13 version requires options to be specified
before the file name argument, so packages with WANT_AUTOCONF="2.1"
would fail to build in a sysroot with the -l option at the end.

Closes: https://bugs.gentoo.org/710792
Signed-off-by: David Michael <fedora.dm0@gmail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 9df0e1b93663..625abd0e9d12 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: autotools.eclass
@@ -512,7 +512,7 @@ autotools_run_tool() {
 	fi
 
 	if ${m4flags} ; then
-		set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include)
+		set -- "${1}" $(autotools_m4dir_include) $(autotools_m4sysdir_include) "${@:2}"
 	fi
 
 	# If the caller wants to probe something, then let them do it directly.