cibw changes

Author: kcleal

.github/workflows/manylinux.yaml

@@ -18,16 +18,15 @@ jobs:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_BUILD: "cp310-manylinux* cp311-manylinux* cp312-manylinux* cp313-manylinux*"
 
-          CIBW_ENVIRONMENT: |
-            OLD_SKIA=1
-            BUILD_GLFW=1
-            BUILD_FREETYPE=0
-            CXXFLAGS+=" -D OLD_SKIA "
-            CPPFLAGS="-I/usr/local/include"
-            LDFLAGS="-L/usr/local/lib"
+          CIBW_BEFORE_ALL_LINUX: |
+            export OLD_SKIA=1
+            export BUILD_GLFW=1
+            export BUILD_FREETYPE=0
+            export CXXFLAGS+=" -D OLD_SKIA "
+            export CPPFLAGS="-I/usr/local/include ${CPPFLAGS:-}"
+            export LDFLAGS="-L/usr/local/lib ${LDFLAGS:-}"
+            bash ci/manylinux-build-deps
 
-          CIBW_ENVIRONMENT_PASS_LINUX: OLD_SKIA BUILD_GLFW BUILD_FREETYPE CXXFLAGS CPPFLAGS LDFLAGS
-          CIBW_BEFORE_ALL_LINUX: bash ci/manylinux-build-deps
           CIBW_BEFORE_BUILD_LINUX: python -m pip install pysam>=0.23.0 numpy>=1.19.3 cython>=3.0.0
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel -v repair -w {dest_dir} {wheel}"
           CIBW_TEST_COMMAND: bash {package}/ci/manylinux-test {wheel}

.github/workflows/manylinux_2_28.yaml

@@ -18,13 +18,13 @@ jobs:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
           CIBW_BUILD: "cp310-manylinux* cp311-manylinux* cp312-manylinux* cp313-manylinux*"
 
-          CIBW_ENVIRONMENT_LINUX: |
-            BUILD_GLFW=0
-            BUILD_FREETYPE=1
-            CPPFLAGS="-I/usr/local/include"
-            LDFLAGS="-L/usr/local/lib"
+          CIBW_BEFORE_ALL_LINUX: |
+            export BUILD_GLFW=0
+            export BUILD_FREETYPE=1
+            export CPPFLAGS="-I/usr/local/include ${CPPFLAGS:-}"
+            export LDFLAGS="-L/usr/local/lib ${LDFLAGS:-}"
+            bash ci/manylinux-build-deps
 
-          CIBW_BEFORE_ALL_LINUX: bash ci/manylinux-build-deps
           CIBW_BEFORE_BUILD_LINUX: |
             python -m pip install pysam>=0.23.0 numpy>=1.19.3 cython>=3.0.0
             echo "Python executable: $(which python)"