From 5e4945344179d2569bd451eef341a761214ce20d Mon Sep 17 00:00:00 2001 From: Yihao Wu Date: Mon, 14 Feb 2022 12:03:04 +0800 Subject: [PATCH 1/2] Fix python package names for rhel8 derived distros Default python version has been changed to python3. So if we still want to use python2 for now, use python2- as the prefix of packages. Signed-off-by: Yihao Wu --- gcc-python-plugin.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc-python-plugin.spec b/gcc-python-plugin.spec index 4e3ae61..a04950f 100644 --- a/gcc-python-plugin.spec +++ b/gcc-python-plugin.spec @@ -48,16 +48,16 @@ BuildRequires: python2 BuildRequires: python2-devel # "six" is used at buildtime: -BuildRequires: python-six +BuildRequires: python2-six # pygments is used when running the selftests: -BuildRequires: python-pygments +BuildRequires: python2-pygments # lxml is used when running the selftests: -BuildRequires: python-lxml +BuildRequires: python2-lxml Requires: gcc-plugin-devel >= 6.5.1 -Requires: python-libs +Requires: python2-libs %global gcc_plugins_dir %(gcc --print-file-name=plugin) -- Gitee From 5646d94802d2843f886e80653d181dc5436305c3 Mon Sep 17 00:00:00 2001 From: Yihao Wu Date: Mon, 14 Feb 2022 12:04:00 +0800 Subject: [PATCH 2/2] Fix the library path plugsched-gcc-python-plugin was randomly chosen path by mistake. We should use the original library path. Signed-off-by: Yihao Wu --- gcc-python-plugin.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc-python-plugin.spec b/gcc-python-plugin.spec index a04950f..2b3e3e5 100644 --- a/gcc-python-plugin.spec +++ b/gcc-python-plugin.spec @@ -71,19 +71,19 @@ Plugins for embedding various versions of Python within GCC make PYTHON=python2 PYTHON_CONFIG=python2-config PLUGIN_DSO=python.so plugin print-gcc-version %install -mkdir -p %{buildroot}/usr/lib64/plugsched-gcc-python-plugin +mkdir -p %{buildroot}/usr/lib64/gcc-python-plugin mkdir -p %{buildroot}/%{gcc_plugins_dir} -install -m 755 python.so %{buildroot}/usr/lib64/plugsched-gcc-python-plugin/python.so +install -m 755 python.so %{buildroot}/usr/lib64/gcc-python-plugin/python.so install -m 755 gcc-c-api/libgcc-c-api.so \ %{buildroot}/%{gcc_plugins_dir}/libgcc-c-api.so %files -/usr/lib64/plugsched-gcc-python-plugin/python.so +/usr/lib64/gcc-python-plugin/python.so %{gcc_plugins_dir}/libgcc-c-api.so %dir -/usr/lib64/plugsched-gcc-python-plugin +/usr/lib64/gcc-python-plugin %changelog * Wed Feb 9 2022 Yihao Wu 0.17-1.1 -- Gitee