From ffd393b7fb1abebc6c887c3525f2e38c51dc3b2b534f00cae12f01ec38057de6 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 21 Sep 2021 07:21:26 +0000 Subject: [PATCH] Accepting request 920465 from home:elvigia:branches:devel:tools - Fix totally broken python support, set the correct python3 interpreter, otherwise it defaults to python, which in our case is python 2.7. (changed kill-env.diff, spec) OBS-URL: https://build.opensuse.org/request/show/920465 OBS-URL: https://build.opensuse.org/package/show/devel:tools/coccinelle?expand=0&rev=84 --- coccinelle.changes | 7 +++++++ coccinelle.spec | 2 +- kill-env.diff | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/coccinelle.changes b/coccinelle.changes index 886b42f..5e24f67 100644 --- a/coccinelle.changes +++ b/coccinelle.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 21 00:36:44 UTC 2021 - Cristian Rodríguez + +- Fix totally broken python support, set the correct python3 + interpreter, otherwise it defaults to python, which in our case + is python 2.7. (changed kill-env.diff, spec) + ------------------------------------------------------------------- Sat Sep 11 12:34:56 UTC 2021 - ohering@suse.de diff --git a/coccinelle.spec b/coccinelle.spec index c5c3eb6..63e26ea 100644 --- a/coccinelle.spec +++ b/coccinelle.spec @@ -60,7 +60,7 @@ fixing bugs in systems code. %build autoreconf -fi -%configure +%configure --with-python=%python_for_executables %make_build -j1 VERBOSE=yes %install diff --git a/kill-env.diff b/kill-env.diff index 4f4aac6..18f7d51 100644 --- a/kill-env.diff +++ b/kill-env.diff @@ -7,13 +7,13 @@ Don't choose arbitrary python interpreters from $PATH. tools/pycocci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: coccinelle-1.0.6/tools/pycocci +Index: coccinelle-1.1.0/tools/pycocci =================================================================== ---- coccinelle-1.0.6.orig/tools/pycocci -+++ coccinelle-1.0.6/tools/pycocci +--- coccinelle-1.1.0.orig/tools/pycocci ++++ coccinelle-1.1.0/tools/pycocci @@ -1,4 +1,4 @@ -#!/usr/bin/env python -+#!/usr/bin/python ++#!/usr/bin/python3 # # Copyright (c) 2014 Luis R. Rodriguez # Copyright (c) 2013 Johannes Berg