From be126e03eabdcd323a47ce462aee5413ed13e3db5d50309dea38e2714a64d960 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 14 Nov 2024 16:11:33 +0000 Subject: [PATCH 1/4] - Remove -IVendor/ from python-config boo#1231795 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python313?expand=0&rev=63 --- python313.changes | 5 +++++ python313.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/python313.changes b/python313.changes index 1333c69..a186d33 100644 --- a/python313.changes +++ b/python313.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 14 07:06:20 UTC 2024 - Matej Cepl + +- Remove -IVendor/ from python-config boo#1231795 + ------------------------------------------------------------------- Thu Oct 24 16:09:00 UTC 2024 - Matej Cepl diff --git a/python313.spec b/python313.spec index ed901cf..37f7ffb 100644 --- a/python313.spec +++ b/python313.spec @@ -836,6 +836,9 @@ install -m 755 -D Tools/gdb/libpython.py %{buildroot}%{_datadir}/gdb/auto-load/% # install devel files to /config #cp Makefile Makefile.pre.in Makefile.pre $RPM_BUILD_ROOT%{sitedir}/config-%{python_abi}/ +# Remove -IVendor/ from python-config boo#1231795 +sed -i 's/-IVendor\///' %{buildroot}%{_bindir}/python%{python_abi}-config + # RPM macros %if %{primary_interpreter} mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ From 6daf155ac40cb7a7f1f1a19742509bb10fd731f31471a5e6caedc40382846c29 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 14 Nov 2024 17:26:42 +0000 Subject: [PATCH 2/4] - Require exact clang18 and llvm18, because apparently CPython is not ready for 19 yet (gh#python/cpython!125499). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python313?expand=0&rev=64 --- python313.changes | 2 ++ python313.spec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/python313.changes b/python313.changes index a186d33..2c6003d 100644 --- a/python313.changes +++ b/python313.changes @@ -2,6 +2,8 @@ Thu Nov 14 07:06:20 UTC 2024 - Matej Cepl - Remove -IVendor/ from python-config boo#1231795 +- Require exact clang18 and llvm18, because apparently CPython is + not ready for 19 yet (gh#python/cpython!125499). ------------------------------------------------------------------- Thu Oct 24 16:09:00 UTC 2024 - Matej Cepl diff --git a/python313.spec b/python313.spec index 37f7ffb..173e0e6 100644 --- a/python313.spec +++ b/python313.spec @@ -257,8 +257,8 @@ BuildRequires: python3-python-docs-theme >= 2022.1 %if %{with experimental_jit} # needed for experimental_jit -BuildRequires: clang => 18 -BuildRequires: llvm => 18 +BuildRequires: clang18 +BuildRequires: llvm18 %endif %if %{without GIL} From c9f290cdec903f18871b0817801bbf8a355ce9ccf5fadd5e3007d1e5a19c228d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 18 Nov 2024 13:48:03 +0000 Subject: [PATCH 3/4] Accepting request 1224835 from home:dimstar:Factory - Allow building with default LLVM version 19: just replace the hard-coded LLVM_version in the scrpts. OBS-URL: https://build.opensuse.org/request/show/1224835 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python313?expand=0&rev=65 --- python313.changes | 6 ++++++ python313.spec | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/python313.changes b/python313.changes index 2c6003d..b166a6a 100644 --- a/python313.changes +++ b/python313.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 15 11:25:06 UTC 2024 - Dominique Leuenberger + +- Allow building with default LLVM version 19: just replace the + hard-coded LLVM_version in the scrpts. + ------------------------------------------------------------------- Thu Nov 14 07:06:20 UTC 2024 - Matej Cepl diff --git a/python313.spec b/python313.spec index 173e0e6..51cd4b9 100644 --- a/python313.spec +++ b/python313.spec @@ -257,8 +257,8 @@ BuildRequires: python3-python-docs-theme >= 2022.1 %if %{with experimental_jit} # needed for experimental_jit -BuildRequires: clang18 -BuildRequires: llvm18 +BuildRequires: clang >= 18 +BuildRequires: llvm >= 18 %endif %if %{without GIL} @@ -504,6 +504,8 @@ echo "master_doc = 'contents'" >> Doc/conf.py # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac +sed -i "s/_LLVM_VERSION = .*/_LLVM_VERSION = $(realpath /usr/bin/clang | awk -F- '{print $2}')/g" ./Tools/jit/_llvm.py + %if %{primary_interpreter} # fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3 for dir in Lib Tools; do From 99d319aa5b6dbf2c32a48426f425173891b7851515dc716aa26aec4f597b26dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 18 Nov 2024 14:04:00 +0000 Subject: [PATCH 4/4] Accepting request 1224886 from home:dimstar:Factory hard-coded LLVM_version in the scripts. Just a typo fixed OBS-URL: https://build.opensuse.org/request/show/1224886 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python313?expand=0&rev=66 --- python313.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python313.changes b/python313.changes index b166a6a..48fc6e1 100644 --- a/python313.changes +++ b/python313.changes @@ -2,7 +2,7 @@ Fri Nov 15 11:25:06 UTC 2024 - Dominique Leuenberger - Allow building with default LLVM version 19: just replace the - hard-coded LLVM_version in the scrpts. + hard-coded LLVM_version in the scripts. ------------------------------------------------------------------- Thu Nov 14 07:06:20 UTC 2024 - Matej Cepl