diff --git a/python313.changes b/python313.changes index 1333c69..48fc6e1 100644 --- a/python313.changes +++ b/python313.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 scripts. + +------------------------------------------------------------------- +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 ed901cf..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: clang => 18 -BuildRequires: llvm => 18 +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 @@ -836,6 +838,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/