| 1 |
commit: 4a74793ea13cc10625c474997bdca1e3c0a7652e |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 26 22:35:58 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 26 22:40:20 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a74793e |
| 7 |
|
| 8 |
sys-devel/automake: Rev bump to fix AM_PATH_PYTHON macro |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/648846 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
...utomake-1.16.ebuild => automake-1.16-r1.ebuild} | 5 ++- |
| 14 |
.../files/automake-1.16-fix-AM_PATH_PYTHON.patch | 36 ++++++++++++++++++++++ |
| 15 |
2 files changed, 40 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/automake/automake-1.16.ebuild b/sys-devel/automake/automake-1.16-r1.ebuild |
| 18 |
similarity index 95% |
| 19 |
rename from sys-devel/automake/automake-1.16.ebuild |
| 20 |
rename to sys-devel/automake/automake-1.16-r1.ebuild |
| 21 |
index 3add6f0127e..65ef083500f 100644 |
| 22 |
--- a/sys-devel/automake/automake-1.16.ebuild |
| 23 |
+++ b/sys-devel/automake/automake-1.16-r1.ebuild |
| 24 |
@@ -42,7 +42,10 @@ DEPEND="${RDEPEND} |
| 25 |
sys-apps/help2man |
| 26 |
test? ( ${PYTHON_DEPS} )" |
| 27 |
|
| 28 |
-PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch ) |
| 29 |
+PATCHES=( |
| 30 |
+ "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch |
| 31 |
+ "${FILESDIR}"/${PN}-1.16-fix-AM_PATH_PYTHON.patch |
| 32 |
+) |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
default |
| 36 |
|
| 37 |
diff --git a/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch b/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch |
| 38 |
new file mode 100644 |
| 39 |
index 00000000000..146496d6dfd |
| 40 |
--- /dev/null |
| 41 |
+++ b/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch |
| 42 |
@@ -0,0 +1,36 @@ |
| 43 |
+bug#30616: automake-1.16: aclocal is unable to process AM_PATH_PYTHON with variable as value |
| 44 |
+ |
| 45 |
+http://lists.gnu.org/archive/html/bug-automake/2018-02/msg00012.html |
| 46 |
+ |
| 47 |
+--- a/m4/python.m4 |
| 48 |
++++ b/m4/python.m4 |
| 49 |
+@@ -36,24 +36,12 @@ AC_DEFUN([AM_PATH_PYTHON], |
| 50 |
+ [ |
| 51 |
+ dnl Find a Python interpreter. Python versions prior to 2.0 are not |
| 52 |
+ dnl supported. (2.0 was released on October 16, 2000). |
| 53 |
+- m4_define_default([am_py_min_ver], m4_ifval([$1], [$1], [2.0])) |
| 54 |
+- dnl The arbitrary default maximum version. |
| 55 |
+- m4_define_default([am_py_max_ver], [4.0]) |
| 56 |
+- |
| 57 |
++ dnl FIXME: Remove the need to hard-code Python versions here. |
| 58 |
+ m4_define_default([_AM_PYTHON_INTERPRETER_LIST], |
| 59 |
+- [[python] \ |
| 60 |
+- dnl If we want some Python 2 versions (min version <= 2.7), |
| 61 |
+- dnl also search for "python2". |
| 62 |
+- m4_if(m4_version_compare(am_py_min_ver, [2.8]), [-1], [python2], []) \ |
| 63 |
+- [python3] \ |
| 64 |
+- dnl Construct a comma-separated list of interpreter names (python2.6, |
| 65 |
+- dnl python2.7, etc). We only care about the first 3 characters of the |
| 66 |
+- dnl version strings (major-dot-minor; not |
| 67 |
+- dnl major-dot-minor-dot-bugfix[-dot-whatever]) |
| 68 |
+- m4_foreach([py_ver], |
| 69 |
+- m4_esyscmd_s(seq -s[[", "]] -f["[[%.1f]]"] m4_substr(am_py_max_ver, [0], [3]) -0.1 m4_substr(am_py_min_ver, [0], [3])), |
| 70 |
+- dnl Remove python2.8 and python2.9 since they will never exist |
| 71 |
+- [m4_bmatch(py_ver, [2.[89]], [], [python]py_ver)])]) |
| 72 |
++[python python2 python3 python3.9 python3.8 python3.7 python3.6 dnl |
| 73 |
++ python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 dnl |
| 74 |
++ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl |
| 75 |
++ python2.1 python2.0]) |
| 76 |
+ |
| 77 |
+ AC_ARG_VAR([PYTHON], [the Python interpreter]) |
| 78 |
+ |
Archives