File 0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch of Package google-or-tools
From 2cf793afd4b3497698e6cd6d7e0cb79eb8424164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Wed, 12 Jun 2024 14:05:17 +0200
Subject: [PATCH] Do not try to copy pybind11_abseil status extension module
The module is already installed in the correct location. And even if not,
it should be done as part of the pybind11_abseil build ...
---
cmake/python.cmake | 4 ----
ortools/python/setup.py.in | 4 ----
2 files changed, 8 deletions(-)
diff --git a/cmake/python.cmake b/cmake/python.cmake
index b2e5731..b35e848 100644
--- a/cmake/python.cmake
+++ b/cmake/python.cmake
@@ -321,7 +321,6 @@ file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/init/python/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/python/__init__.py CONTENT "")
if(BUILD_MATH_OPT)
- file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/../pybind11_abseil/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/core/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/core/python/__init__.py CONTENT "")
@@ -465,8 +464,6 @@ add_custom_command(
$<TARGET_FILE:model_builder_helper_pybind11> ${PYTHON_PROJECT}/linear_solver/python
COMMAND ${CMAKE_COMMAND} -E copy
$<TARGET_FILE:math_opt_pybind11> ${PYTHON_PROJECT}/math_opt/core/python
- COMMAND ${CMAKE_COMMAND} -E copy
- $<TARGET_FILE:status_py_extension_stub> ${PYTHON_PROJECT}/../pybind11_abseil
COMMAND ${CMAKE_COMMAND} -E
$<IF:$<TARGET_EXISTS:pdlp_pybind11>,copy,true>
$<$<TARGET_EXISTS:pdlp_pybind11>:$<TARGET_FILE:pdlp_pybind11>> ${PYTHON_PROJECT}/pdlp/python
@@ -523,7 +520,6 @@ add_custom_command(
COMMAND ${stubgen_EXECUTABLE} -p ortools.constraint_solver.pywrapcp --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.linear_solver.pywraplp --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.linear_solver.python.model_builder_helper --output .
- COMMAND ${stubgen_EXECUTABLE} -p pybind11_abseil.status --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.math_opt.core.python.solver --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.pdlp.python.pdlp --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.sat.python.swig_helper --output .
diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in
index e0627a3..a02c7e6 100644
--- a/ortools/python/setup.py.in
+++ b/ortools/python/setup.py.in
@@ -81,10 +81,6 @@ setup(
'*.pyi',
'py.typed'
],
- 'pybind11_abseil':[
- '$<TARGET_FILE_NAME:status_py_extension_stub>',
- '*.pyi'
- ],
'@PYTHON_PROJECT@.math_opt':['*.pyi'],
'@PYTHON_PROJECT@.math_opt.core.python':[
'$<TARGET_FILE_NAME:math_opt_pybind11>',
--
2.47.1