Compare commits
5 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 8e07f6a762 | |||
| 395d512bb3 | |||
| 7eec2ae5cc | |||
| d877fdbaac | |||
| 08987776c4 |
@@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 17 05:44:35 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Update patch support-new-cmake.patch:
|
||||
* Check for a different cache error message as well as the original.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 4 02:52:33 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Add patch support-new-cmake.patch:
|
||||
* Support newer version of cmake.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 27 15:31:45 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-scikit-build
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -36,6 +36,8 @@ Source: https://files.pythonhosted.org/packages/source/s/scikit-build/sc
|
||||
Source99: sample-setup.cfg
|
||||
# PATCH-FIX-UPSTREAM scikit-build-pr1120-upddistutils.patch gh#scikit-build/scikit-build#1120
|
||||
Patch0: scikit-build-pr1120-upddistutils.patch
|
||||
# PATCH-FIX-OPENSUSE Support newer cmake
|
||||
Patch1: support-new-cmake.patch
|
||||
BuildRequires: %{python_module devel >= 3.8}
|
||||
BuildRequires: %{python_module hatch-fancy-pypi-readme}
|
||||
BuildRequires: %{python_module hatch-vcs}
|
||||
|
||||
24
support-new-cmake.patch
Normal file
24
support-new-cmake.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
Index: scikit_build-0.18.1/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
|
||||
===================================================================
|
||||
--- scikit_build-0.18.1.orig/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
|
||||
+++ scikit_build-0.18.1/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.2)
|
||||
+cmake_minimum_required(VERSION 3.5.0)
|
||||
|
||||
project(hello NONE)
|
||||
|
||||
Index: scikit_build-0.18.1/tests/test_cmaker.py
|
||||
===================================================================
|
||||
--- scikit_build-0.18.1.orig/tests/test_cmaker.py
|
||||
+++ scikit_build-0.18.1/tests/test_cmaker.py
|
||||
@@ -82,7 +82,8 @@ def test_make_without_configure_fails(ca
|
||||
CMaker().make()
|
||||
_, err = capfd.readouterr()
|
||||
assert "An error occurred while building with CMake." in str(excinfo.value)
|
||||
- assert "Error: could not load cache" in err
|
||||
+ assert ("Error: could not load cache" in err) or (
|
||||
+ "Error: not a CMake build directory (missing CMakeCache.txt)" in err)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("configure_with_cmake_source_dir", [True, False])
|
||||
Reference in New Issue
Block a user