Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
57 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
TIMESTAMP = 1619044509 | ||
SHA256 (google-or-tools-v8.2_GH0.tar.gz) = cf40715fa5cfeee88e2c8f5583465182c8dedf60b4eb7c4a967b32ff61ac4302 | ||
SIZE (google-or-tools-v8.2_GH0.tar.gz) = 236722388 | ||
TIMESTAMP = 1633451473 | ||
SHA256 (google-or-tools-v9.1_GH0.tar.gz) = b51ca3b08f768de5a0c1029f7127264640e50d9c7b83383a175109ef213bd307 | ||
SIZE (google-or-tools-v9.1_GH0.tar.gz) = 245524168 | ||
SHA256 (c68ae78b1d78406dc4379afcacbfb156492c80c0.patch) = c073b783b1923da1f63f5f4f089aac20213b7e8bdb8ef0ccfa94ba4f6190b87b | ||
SIZE (c68ae78b1d78406dc4379afcacbfb156492c80c0.patch) = 680 | ||
SHA256 (3bbe33d9776c8f200a3296344e7df7bdf91188fe.patch) = 1b4e3d25d019877e5622acbf69367e0e615c88f45bb336c20fffedf74786be50 | ||
SIZE (3bbe33d9776c8f200a3296344e7df7bdf91188fe.patch) = 2778 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,20 @@ | ||
--- cmake/python.cmake.orig 2020-12-09 16:30:21 UTC | ||
--- cmake/python.cmake.orig 2021-10-01 03:13:58 UTC | ||
+++ cmake/python.cmake | ||
@@ -23,7 +23,7 @@ if(UNIX AND NOT APPLE) | ||
endif() | ||
|
||
# Find Python | ||
-find_package(Python REQUIRED COMPONENTS Interpreter Development) | ||
+find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS Interpreter Development) | ||
# Find Python 3 | ||
-find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module) | ||
+find_package(Python3 ${FREEBSD_PYTHON_VER} REQUIRED EXACT COMPONENTS Interpreter Development.Module) | ||
list(APPEND CMAKE_SWIG_FLAGS "-py3" "-DPY3") | ||
|
||
if(Python_VERSION VERSION_GREATER_EQUAL 3) | ||
list(APPEND CMAKE_SWIG_FLAGS "-py3" "-DPY3") | ||
@@ -206,7 +206,7 @@ if(BUILD_TESTING) | ||
# Find if python module MODULE_NAME is available, | ||
@@ -214,7 +214,7 @@ if(BUILD_TESTING) | ||
COMMAND ${VENV_EXECUTABLE} ${VENV_DIR} | ||
# Must not call it in a folder containing the setup.py otherwise pip call it | ||
# (i.e. "python setup.py bdist") while we want to consume the wheel package | ||
- COMMAND ${VENV_Python_EXECUTABLE} -m pip install --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PROJECT_NAME} | ||
+ COMMAND ${VENV_Python_EXECUTABLE} -m pip install --no-index --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PROJECT_NAME} | ||
- COMMAND ${VENV_Python3_EXECUTABLE} -m pip install --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PROJECT_NAME} | ||
+ COMMAND ${VENV_Python3_EXECUTABLE} -m pip install --no-index --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PROJECT_NAME} | ||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/test.py.in ${VENV_DIR}/test.py | ||
BYPRODUCTS ${VENV_DIR} | ||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} VERBATIM) |
11 changes: 0 additions & 11 deletions
11
math/py-or-tools/files/patch-ortools_base_integral__types.h
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
See https://github.com/google/or-tools/issues/2305 | ||
|
||
--- ortools/python/setup.py.in.orig 2021-03-02 14:21:44 UTC | ||
--- ortools/python/setup.py.in.orig 2021-10-01 03:13:58 UTC | ||
+++ ortools/python/setup.py.in | ||
@@ -42,8 +42,8 @@ setup( | ||
version='@PROJECT_VERSION@', | ||
packages=find_packages(), | ||
install_requires=[ | ||
- 'protobuf >= 3.15.3', | ||
- 'absl-py >= 0.11', | ||
+ #'protobuf >= 3.15.3', | ||
+ #'absl-py >= 0.11', | ||
- 'protobuf >= 3.18.0', | ||
- 'absl-py >= 0.13', | ||
+ #'protobuf >= 3.18.0', | ||
+ #'absl-py >= 0.13', | ||
], | ||
package_data={ | ||
'@PROJECT_NAME@':[$<$<NOT:$<PLATFORM_ID:Windows>>:'.libs/*', '../$<TARGET_SONAME_FILE_NAME:ortools>'>], | ||
'@PROJECT_NAME@':[$<$<STREQUAL:$<TARGET_PROPERTY:@PYTHON_PROJECT@,TYPE>,SHARED_LIBRARY>:'.libs/*', '../$<TARGET_SONAME_FILE_NAME:@PYTHON_PROJECT@>'>], |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
See https://github.com/google/or-tools/issues/2305 | ||
|
||
--- tools/setup.py.in.orig 2020-12-09 16:30:21 UTC | ||
--- tools/setup.py.in.orig 2021-10-01 03:13:58 UTC | ||
+++ tools/setup.py.in | ||
@@ -42,8 +42,8 @@ setup( | ||
version='VVVV', | ||
packages=find_packages(), | ||
install_requires=[ | ||
- 'protobuf >= 3.14.0', | ||
- 'absl-py >= 0.11', | ||
+ #'protobuf >= 3.14.0', | ||
+ #'absl-py >= 0.11', | ||
- 'protobuf >= 3.18.0', | ||
- 'absl-py >= 0.13', | ||
+ #'protobuf >= 3.18.0', | ||
+ #'absl-py >= 0.13', | ||
], | ||
package_data={ | ||
'ortools.constraint_solver' : ['_pywrapcp.dll', '*.pyi'], | ||
'ortools.init' : ['_pywrapinit.dll', '*.pyi'], |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters