a55b0269f0
Backport ab347652df9ff8f65ba1be6aaa357cf3c2b16dca which ensures that the am__pep3147_tweak is properly defined in all cases. Resloves: RHEL-59974
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From ab347652df9ff8f65ba1be6aaa357cf3c2b16dca Mon Sep 17 00:00:00 2001
|
|
From: Bogdan <bogdro_rep@gmx.us>
|
|
Date: Wed, 5 Jul 2023 08:59:29 -0700
|
|
Subject: [PATCH] python: support noinst_PYTHON preceding foo_PYTHON.
|
|
|
|
This change fixes https://bugs.gnu.org/24507.
|
|
|
|
* lib/am/python.am (am__pep3147_tweak): remove conditional
|
|
on %?INSTALL%.
|
|
* t/python-pr10995.sh: test with make uninstall.
|
|
---
|
|
lib/am/python.am | 4 ++--
|
|
t/python-pr10995.sh | 6 ++++++
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/am/python.am b/lib/am/python.am
|
|
index 98f95af1b..19f268efc 100644
|
|
--- a/lib/am/python.am
|
|
+++ b/lib/am/python.am
|
|
@@ -94,11 +94,11 @@ endif %?INSTALL%
|
|
## Uninstalling. ##
|
|
## -------------- ##
|
|
|
|
-if %?INSTALL%
|
|
-
|
|
?FIRST?am__pep3147_tweak = \
|
|
?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc __pycache__/&.*.pyo|'
|
|
|
|
+if %?INSTALL%
|
|
+
|
|
.PHONY uninstall-am: uninstall-%DIR%PYTHON
|
|
uninstall-%DIR%PYTHON:
|
|
@$(NORMAL_UNINSTALL)
|
|
diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
|
|
index 324be916e..abeb8a124 100644
|
|
--- a/t/python-pr10995.sh
|
|
+++ b/t/python-pr10995.sh
|
|
@@ -17,6 +17,9 @@
|
|
# Test automake bug#10995: am__py_compile doesn't get correctly defined
|
|
# when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON'
|
|
# declaration.
|
|
+# Test also automake bug#24507: am__pep3147_tweak doesn't get correctly
|
|
+# defined when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON'
|
|
+# declaration and 'make uninstall' fails functionally (just shows errors).
|
|
|
|
required=python
|
|
. test-init.sh
|
|
@@ -53,4 +56,7 @@ py_installed --not inst/py/no.pyc
|
|
|
|
$MAKE disttest
|
|
|
|
+LC_ALL=C run_make -M uninstall
|
|
+grep 'command substitution' output && exit 1
|
|
+
|
|
:
|
|
--
|
|
2.47.0
|
|
|