cibw changes

Author: kcleal

.github/workflows/manylinux.yaml

@@ -22,14 +22,13 @@ jobs:
             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_BEFORE_BUILD_LINUX: |
             python -m pip install numpy>=1.19.3 "cython>=3.0.0,<3.1"
-            python -m pip install --no-binary=pysam pysam>=0.23.0
+            python -m pip install --no-binary=pysam --force-reinstall --no-cache-dir pysam>=0.23.0
 
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel -v repair -w {dest_dir} {wheel}"
           CIBW_TEST_COMMAND: bash {package}/ci/manylinux-test {wheel}

ci/manylinux-build-deps

@@ -25,7 +25,7 @@ yum install -y fontconfig-devel libjpeg-turbo-devel libpng-devel \
     libuuid-devel librsvg2-devel \
     libX11-devel mesa-libEGL-devel mesa-libGLES-devel \
     wayland-devel wayland-protocols-devel \
-    harfbuzz brotli-devel
+    harfbuzz brotli-devel, gperf
 
 # GLFW
 if [[ "$BUILD_GLFW" == "1" ]]; then
@@ -108,34 +108,33 @@ if [[ "$BUILD_FREETYPE" == "1" ]]; then
   ./configure --prefix=/usr/local \
               --enable-static \
               --enable-shared \
-              --with-freetype-config=/usr/local/bin/freetype-config \
               FREETYPE_CFLAGS="$FREETYPE_CFLAGS" \
               FREETYPE_LIBS="$FREETYPE_LIBS"
 
   make -j3 && make install
 
-  # Verify fontconfig is using our FreeType
-  echo "fontconfig dependencies:"
-  ldd /usr/local/lib/libfontconfig.so | grep freetype || echo "No freetype dependency found"
-
-  cd ../
-
-  # Step 3: Update system library paths to prefer our versions
-  echo "Setting up library paths..."
-
-  # Create symlinks so the system finds our libraries first
-  ln -sf /usr/local/lib/libfreetype.so.6 /usr/lib64/libfreetype.so.6 || true
-  ln -sf /usr/local/lib/libfreetype.so /usr/lib64/libfreetype.so || true
-  ln -sf /usr/local/lib/libfontconfig.so.1 /usr/lib64/libfontconfig.so.1 || true
-  ln -sf /usr/local/lib/libfontconfig.so /usr/lib64/libfontconfig.so || true
-
-  # Update ld cache
-  echo "/usr/local/lib" > /etc/ld.so.conf.d/custom-libs.conf
-  ldconfig
-
-  # Set build environment
-  export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-  export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
+#  # Verify fontconfig is using our FreeType
+#  echo "fontconfig dependencies:"
+#  ldd /usr/local/lib/libfontconfig.so | grep freetype || echo "No freetype dependency found"
+#
+#  cd ../
+#
+#  # Step 3: Update system library paths to prefer our versions
+#  echo "Setting up library paths..."
+#
+#  # Create symlinks so the system finds our libraries first
+#  ln -sf /usr/local/lib/libfreetype.so.6 /usr/lib64/libfreetype.so.6 || true
+#  ln -sf /usr/local/lib/libfreetype.so /usr/lib64/libfreetype.so || true
+#  ln -sf /usr/local/lib/libfontconfig.so.1 /usr/lib64/libfontconfig.so.1 || true
+#  ln -sf /usr/local/lib/libfontconfig.so /usr/lib64/libfontconfig.so || true
+#
+#  # Update ld cache
+#  echo "/usr/local/lib" > /etc/ld.so.conf.d/custom-libs.conf
+#  ldconfig
+#
+#  # Set build environment
+#  export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+#  export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
 
 else
   yum install -y freetype-devel
@@ -160,15 +159,15 @@ ls -lh ./gwplot
 
 echo "=== DEBUGGING LIBGW SYMBOLS ==="
 echo "Checking if FT_Get_Color_Glyph_Layer is in libgw:"
-nm -D libgw/libgw.so | grep FT_Get_Color_Glyph_Layer || echo "Symbol NOT found in libgw"
+nm -D gw/libgw/libgw.so | grep FT_Get_Color_Glyph_Layer || echo "Symbol NOT found in libgw"
 
 echo "All FreeType symbols in libgw:"
-nm -D libgw/libgw.so | grep "^[0-9a-f]* [TW] FT_" | head -10 || echo "No FreeType symbols found"
+nm -D gw/libgw/libgw.so | grep "^[0-9a-f]* [TW] FT_" | head -10 || echo "No FreeType symbols found"
 
 echo "libgw dependencies:"
-ldd libgw/libgw.so | grep freetype || echo "No freetype dependency"
+ldd gw/libgw/libgw.so | grep freetype || echo "No freetype dependency"
 
 echo "fontconfig dependency:"
-ldd libgw/libgw.so | grep fontconfig || echo "No fontconfig dependency"
+ldd gw/libgw/libgw.so | grep fontconfig || echo "No fontconfig dependency"
 
 echo "MANYLINUX-DEPS DONE"