1 |
commit: a8c2c6280ec83612c914a212734db234e90cef6f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 10 05:51:31 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 10 05:52:22 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c2c628 |
7 |
|
8 |
sys-devel/autoconf-archive: backport upstream patches |
9 |
|
10 |
Both pretty critical: |
11 |
- Revert broken AX_PTHREAD change which leads to unnecessary/incorrect |
12 |
changes in downstream configure.acs. |
13 |
- Python 3.10+ fixes |
14 |
|
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
.../autoconf-archive-2021.02.19-r1.ebuild | 21 +++++++ |
18 |
.../autoconf-archive-2021.02.19-python310.patch | 36 +++++++++++ |
19 |
...onf-archive-2021.02.19-revert-ax_pthreads.patch | 70 ++++++++++++++++++++++ |
20 |
3 files changed, 127 insertions(+) |
21 |
|
22 |
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild |
23 |
new file mode 100644 |
24 |
index 00000000000..d9ba9d3bedf |
25 |
--- /dev/null |
26 |
+++ b/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild |
27 |
@@ -0,0 +1,21 @@ |
28 |
+# Copyright 1999-2021 Gentoo Authors |
29 |
+# Distributed under the terms of the GNU General Public License v2 |
30 |
+ |
31 |
+EAPI="7" |
32 |
+ |
33 |
+DESCRIPTION="GNU Autoconf Macro Archive" |
34 |
+HOMEPAGE="https://www.gnu.org/software/autoconf-archive/" |
35 |
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
36 |
+ |
37 |
+LICENSE="GPL-3" |
38 |
+SLOT="0" |
39 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
40 |
+ |
41 |
+# File collisions. #540246 |
42 |
+RDEPEND="!=gnome-base/gnome-common-3.14.0-r0 |
43 |
+ !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]" |
44 |
+ |
45 |
+PATCHES=( |
46 |
+ "${FILESDIR}"/${PN}-2021.02.19-python310.patch |
47 |
+ "${FILESDIR}"/${PN}-2021.02.19-revert-ax_pthreads.patch |
48 |
+) |
49 |
|
50 |
diff --git a/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch |
51 |
new file mode 100644 |
52 |
index 00000000000..d76605eb5c1 |
53 |
--- /dev/null |
54 |
+++ b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch |
55 |
@@ -0,0 +1,36 @@ |
56 |
+Ensure configure tests don't fail with Python 3.10, 3.11. |
57 |
+ |
58 |
+https://github.com/autoconf-archive/autoconf-archive/pull/235 |
59 |
+ |
60 |
+From: Yaakov Selkowitz <yselkowi@××××××.com> |
61 |
+Date: Thu, 5 Aug 2021 11:12:47 -0400 |
62 |
+Subject: [PATCH 1/2] AX_PYTHON_DEVEL: fix for Python 3.10+ |
63 |
+ |
64 |
+--- a/m4/ax_python_devel.m4 |
65 |
++++ b/m4/ax_python_devel.m4 |
66 |
+@@ -208,7 +208,7 @@ EOD` |
67 |
+ ac_python_version=$PYTHON_VERSION |
68 |
+ else |
69 |
+ ac_python_version=`$PYTHON -c "import sys; \ |
70 |
+- print (sys.version[[:3]])"` |
71 |
++ print ("%d.%d" % sys.version_info[[:2]])"` |
72 |
+ fi |
73 |
+ fi |
74 |
+ |
75 |
+ |
76 |
+From: Yaakov Selkowitz <yselkowi@××××××.com> |
77 |
+Date: Thu, 5 Aug 2021 11:27:24 -0400 |
78 |
+Subject: [PATCH 2/2] AX_PYTHON: Add 3.10 and 3.11 |
79 |
+ |
80 |
+--- a/m4/ax_python.m4 |
81 |
++++ b/m4/ax_python.m4 |
82 |
+@@ -55,7 +55,7 @@ |
83 |
+ AC_DEFUN([AX_PYTHON], |
84 |
+ [AC_MSG_CHECKING(for python build information) |
85 |
+ AC_MSG_RESULT([]) |
86 |
+-for python in python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do |
87 |
++for python in python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do |
88 |
+ AC_CHECK_PROGS(PYTHON_BIN, [$python]) |
89 |
+ ax_python_bin=$PYTHON_BIN |
90 |
+ if test x$ax_python_bin != x; then |
91 |
+ |
92 |
|
93 |
diff --git a/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch |
94 |
new file mode 100644 |
95 |
index 00000000000..3800fd292a6 |
96 |
--- /dev/null |
97 |
+++ b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch |
98 |
@@ -0,0 +1,70 @@ |
99 |
+This is an upstream revert which hasn't yet landed in a release. |
100 |
+ |
101 |
+https://github.com/autoconf-archive/autoconf-archive/commit/59008cc7f85e1982eb298e1c424c2e6ad5942c4a |
102 |
+https://github.com/autoconf-archive/autoconf-archive/pull/233 |
103 |
+https://github.com/autoconf-archive/autoconf-archive/commit/2567e0ce0f3a11b535c6b527386197fb49ff172b |
104 |
+ |
105 |
+From: David Seifert <soap@g.o> |
106 |
+Date: Sat, 12 Jun 2021 22:29:03 +0200 |
107 |
+Subject: [PATCH] Revert "AX_PTHREAD: target > host" |
108 |
+ |
109 |
+This reverts commit 2567e0ce0f3a11b535c6b527386197fb49ff172b. |
110 |
+ |
111 |
+* `AC_CANONICAL_HOST` is the system on which the actual binary will run, |
112 |
+ `AC_CANONICAL_TARGET` is the system for which code is generated. The |
113 |
+ Autoconf manual even mentions that |
114 |
+ |
115 |
+ --target=target-type |
116 |
+ the type of system for which any compiler tools in the package produce code (**rarely needed**). |
117 |
+--- a/m4/ax_pthread.m4 |
118 |
++++ b/m4/ax_pthread.m4 |
119 |
+@@ -87,11 +87,11 @@ |
120 |
+ # modified version of the Autoconf Macro, you may extend this special |
121 |
+ # exception to the GPL to apply to your modified version as well. |
122 |
+ |
123 |
+-#serial 30 |
124 |
++#serial 31 |
125 |
+ |
126 |
+ AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) |
127 |
+ AC_DEFUN([AX_PTHREAD], [ |
128 |
+-AC_REQUIRE([AC_CANONICAL_TARGET]) |
129 |
++AC_REQUIRE([AC_CANONICAL_HOST]) |
130 |
+ AC_REQUIRE([AC_PROG_CC]) |
131 |
+ AC_REQUIRE([AC_PROG_SED]) |
132 |
+ AC_LANG_PUSH([C]) |
133 |
+@@ -158,7 +158,7 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread -- |
134 |
+ # --thread-safe: KAI C++ |
135 |
+ # pthread-config: use pthread-config program (for GNU Pth library) |
136 |
+ |
137 |
+-case $target_os in |
138 |
++case $host_os in |
139 |
+ |
140 |
+ freebsd*) |
141 |
+ |
142 |
+@@ -248,7 +248,7 @@ AS_IF([test "x$ax_pthread_clang" = "xyes"], |
143 |
+ # definitions is, on some systems, a strong hint that pthreads support is |
144 |
+ # correctly enabled |
145 |
+ |
146 |
+-case $target_os in |
147 |
++case $host_os in |
148 |
+ darwin* | hpux* | linux* | osf* | solaris*) |
149 |
+ ax_pthread_check_macro="_REENTRANT" |
150 |
+ ;; |
151 |
+@@ -450,7 +450,7 @@ if test "x$ax_pthread_ok" = "xyes"; then |
152 |
+ AC_CACHE_CHECK([whether more special flags are required for pthreads], |
153 |
+ [ax_cv_PTHREAD_SPECIAL_FLAGS], |
154 |
+ [ax_cv_PTHREAD_SPECIAL_FLAGS=no |
155 |
+- case $target_os in |
156 |
++ case $host_os in |
157 |
+ solaris*) |
158 |
+ ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" |
159 |
+ ;; |
160 |
+@@ -480,7 +480,7 @@ if test "x$ax_pthread_ok" = "xyes"; then |
161 |
+ |
162 |
+ # More AIX lossage: compile with *_r variant |
163 |
+ if test "x$GCC" != "xyes"; then |
164 |
+- case $target_os in |
165 |
++ case $host_os in |
166 |
+ aix*) |
167 |
+ AS_CASE(["x/$CC"], |
168 |
+ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], |