From 9c26f66e0b0eeceee43e3c27cdc594036b569b2e Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Thu, 4 Apr 2024 01:04:12 -0700 Subject: =?UTF-8?q?math/py-nlopt:=20update=202.7.1=20=E2=86=92=202.7.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by: portscout --- math/py-nlopt/files/patch-CMakeLists.txt | 20 ++++++++++++++++++++ math/py-nlopt/files/patch-extensions.py | 4 ++-- .../py-nlopt/files/patch-extern_nlopt_CMakeLists.txt | 14 ++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 math/py-nlopt/files/patch-CMakeLists.txt create mode 100644 math/py-nlopt/files/patch-extern_nlopt_CMakeLists.txt (limited to 'math/py-nlopt/files') diff --git a/math/py-nlopt/files/patch-CMakeLists.txt b/math/py-nlopt/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..482d889f62b6 --- /dev/null +++ b/math/py-nlopt/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2024-04-03 02:23:20 UTC ++++ CMakeLists.txt +@@ -2,6 +2,8 @@ project(nlopt-python) + + project(nlopt-python) + ++set(FREEBSD_PYTHON_VER $ENV{FREEBSD_PYTHON_VER}) ++ + set (CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}) + set (CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/nlopt) + set (INSTALL_PYTHON_DIR ${CMAKE_INSTALL_PREFIX}) +@@ -9,7 +11,7 @@ if (NOT WIN32) + option (BUILD_SHARED_LIBS OFF) + + if (NOT WIN32) +- find_package (PythonInterp) ++ find_package (PythonInterp ${FREEBSD_PYTHON_VER} EXACT) + + execute_process( + COMMAND diff --git a/math/py-nlopt/files/patch-extensions.py b/math/py-nlopt/files/patch-extensions.py index 1c8cfb1104cd..22c394738ec0 100644 --- a/math/py-nlopt/files/patch-extensions.py +++ b/math/py-nlopt/files/patch-extensions.py @@ -1,6 +1,6 @@ ---- extensions.py.orig 2022-06-19 20:42:31 UTC +--- extensions.py.orig 2024-04-03 02:23:20 UTC +++ extensions.py -@@ -25,7 +25,7 @@ class NLOptBuild(build_ext): +@@ -26,7 +26,7 @@ class NLOptBuild(build_ext): except OSError: raise RuntimeError("CMake must be installed") diff --git a/math/py-nlopt/files/patch-extern_nlopt_CMakeLists.txt b/math/py-nlopt/files/patch-extern_nlopt_CMakeLists.txt new file mode 100644 index 000000000000..f4d2675e7f87 --- /dev/null +++ b/math/py-nlopt/files/patch-extern_nlopt_CMakeLists.txt @@ -0,0 +1,14 @@ +--- extern/nlopt/CMakeLists.txt.orig 2024-04-04 04:49:46 UTC ++++ extern/nlopt/CMakeLists.txt +@@ -317,9 +317,9 @@ if (NLOPT_PYTHON) + + if (NLOPT_PYTHON) + if (CMAKE_VERSION VERSION_LESS 3.24) +- find_package (Python COMPONENTS Interpreter Development) ++ find_package (Python ${FREEBSD_PYTHON_VER} EXACT COMPONENTS Interpreter Development) + else () +- find_package (Python COMPONENTS Interpreter Development.Module) ++ find_package (Python ${FREEBSD_PYTHON_VER} EXACT COMPONENTS Interpreter Development.Module) + endif () + + find_package (NumPy) -- cgit v1.2.3