[packages/automake] - added py-compile fix for python2.7; release 2
qboosh
qboosh at pld-linux.org
Sun Jul 20 19:49:52 CEST 2025
commit b4840d59bbca20c25dc82b19193a82a45472dc6c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jul 20 19:51:33 2025 +0200
- added py-compile fix for python2.7; release 2
automake-python2.patch | 12 ++++++++++++
automake.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/automake.spec b/automake.spec
index 6926118..4a9e5c8 100644
--- a/automake.spec
+++ b/automake.spec
@@ -14,7 +14,7 @@ Summary(tr.UTF-8): Makefile yapılandırma araçları
Summary(uk.UTF-8): GNU automake - інструменти для автоматичної генерації Makefile'ів
Name: automake
Version: 1.18
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2+
Group: Development/Building
@@ -25,6 +25,7 @@ Patch1: %{name}-man.patch
Patch2: %{name}-no_versioned_dir.patch
Patch3: revert-debian-python-hacks.patch
Patch4: python-3.10.patch
+Patch5: %{name}-python2.patch
URL: http://www.gnu.org/software/automake/
BuildRequires: autoconf >= 2.72
%if %{without bootstrap}
@@ -109,6 +110,7 @@ Makefile'ів.
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
+%patch -P5 -p1
%if %{without bootstrap}
%{__sed} -i -e '/AM_INIT_AUTOMAKE/ s/-Werror //' configure.ac
diff --git a/automake-python2.patch b/automake-python2.patch
new file mode 100644
index 0000000..6214841
--- /dev/null
+++ b/automake-python2.patch
@@ -0,0 +1,12 @@
+Python 2.7 prints version to stderr, not stdout
+--- automake-1.18/lib/py-compile.orig 2025-02-09 18:32:16.000000000 +0100
++++ automake-1.18/lib/py-compile 2025-07-20 19:45:52.624357636 +0200
+@@ -35,7 +35,7 @@ me=py-compile
+
+ # People apparently set PYTHON=: and expect the result to be true.
+ # For the same reason, we output to stdout instead of stderr. Bizarre.
+-if $PYTHON -V 2>/dev/null | grep -i python >/dev/null; then :; else
++if $PYTHON -V 2>&1 | grep -i python >/dev/null; then :; else
+ echo "$me: Invalid python executable (according to -V): $PYTHON"
+ echo "$me: Python support disabled"
+ if test x"$PYTHON" = xfalse; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/automake.git/commitdiff/b4840d59bbca20c25dc82b19193a82a45472dc6c
More information about the pld-cvs-commit
mailing list