Fixing python build

Author: msoos

CMakeLists.txt

@@ -373,6 +373,21 @@ if(POLICY CMP0169)
     cmake_policy(SET CMP0169 OLD)
 endif()
 
+# Collect macOS-specific flags to forward to child CMake builds so that
+# cross-compilation (e.g. universal2, x86_64 under Rosetta) works correctly.
+# CMAKE_OSX_ARCHITECTURES is set by scikit-build-core when building Python wheels.
+set(_osx_cmake_args "")
+set(_osx_arch_cxxflags "")
+if(CMAKE_OSX_ARCHITECTURES)
+    list(APPEND _osx_cmake_args "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
+    foreach(_arch ${CMAKE_OSX_ARCHITECTURES})
+        string(APPEND _osx_arch_cxxflags " -arch ${_arch}")
+    endforeach()
+endif()
+if(CMAKE_OSX_DEPLOYMENT_TARGET)
+    list(APPEND _osx_cmake_args "-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+endif()
+
 # ---- CryptoMiniSat5 and its deps (cadical, cadiback) ----
 # cadical and cadiback are only needed when auto-building CryptoMiniSat5.
 # cadiback's configure looks for ../cadical, so both must be siblings under deps/.
@@ -397,7 +412,7 @@ if(NOT cryptominisat5_DIR)
         if(NOT EXISTS "${_cadical_lib}")
             message(STATUS "CaDiCaL: building in ${_cadical_src}")
             execute_process(
-                COMMAND bash -c "CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=-fPIC ./configure --no-contracts --no-tracing --fp"
+                COMMAND bash -c "CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=\"-fPIC${_osx_arch_cxxflags}\" ./configure --no-contracts --no-tracing --fp"
                 WORKING_DIRECTORY "${_cadical_src}"
                 RESULT_VARIABLE _cadical_cfg_ret
             )
@@ -434,7 +449,7 @@ if(NOT cryptominisat5_DIR)
         if(NOT EXISTS "${_cadiback_lib}")
             message(STATUS "CaDiBaCk: building in ${_cadiback_src}")
             execute_process(
-                COMMAND bash -c "CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=-fPIC ./configure --release"
+                COMMAND bash -c "CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=\"-fPIC${_osx_arch_cxxflags}\" ./configure --release"
                 WORKING_DIRECTORY "${_cadiback_src}"
                 RESULT_VARIABLE _cadiback_cfg_ret
             )
@@ -477,6 +492,7 @@ if(NOT cryptominisat5_DIR)
                 -Dcadiback_DIR=${cadiback_DIR}
                 -DGMP_LIBRARY=${GMP_LIBRARY}
                 -DGMPXX_LIBRARY=${GMPXX_LIBRARY}
+                ${_osx_cmake_args}
             RESULT_VARIABLE _cms_cfg_ret
         )
         if(NOT _cms_cfg_ret EQUAL 0)
@@ -526,6 +542,7 @@ if(NOT arjun_DIR)
                     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
                     -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+                    ${_osx_cmake_args}
                 RESULT_VARIABLE _sbva_cfg_ret
             )
             if(NOT _sbva_cfg_ret EQUAL 0)
@@ -563,6 +580,7 @@ if(NOT arjun_DIR)
                     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
                     -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+                    ${_osx_cmake_args}
                 RESULT_VARIABLE _tdec_cfg_ret
             )
             if(NOT _tdec_cfg_ret EQUAL 0)
@@ -606,6 +624,7 @@ if(NOT arjun_DIR)
                 -DGMP_LIBRARY=${GMP_LIBRARY}
                 -DGMPXX_LIBRARY=${GMPXX_LIBRARY}
                 -DGMP_INCLUDE_DIR=${GMP_INCLUDE_DIR}
+                ${_osx_cmake_args}
             RESULT_VARIABLE _arjun_cfg_ret
         )
         if(NOT _arjun_cfg_ret EQUAL 0)
@@ -652,6 +671,7 @@ if(USE_EVALMAXSAT)
                     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
                     -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+                    ${_osx_cmake_args}
                 RESULT_VARIABLE _evalmaxsat_cfg_ret
             )
             if(NOT _evalmaxsat_cfg_ret EQUAL 0)

pyproject.toml

@@ -16,7 +16,6 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: C++",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -25,7 +24,7 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Topic :: Utilities"
     ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 readme = "python/README.md"
 
 [tool.scikit-build]
@@ -47,7 +46,7 @@ wheel.packages = []          # pure-Python packages to include (none; extension
 install.components = ["python"]  # only install the pyapproxmc.so, not the full library
 
 [tool.cibuildwheel]
-build = "cp38-* cp39-* cp310-* cp311-* cp312-* cp313-*"
+build = "cp39-* cp310-* cp311-* cp312-* cp313-*"
 skip = "pp* *-musllinux* *i686"
 build-frontend = "build"
 test-requires = "pytest"