Skip to content

Commit 680e19c

Browse files
committed
cibw changes
1 parent d1aa387 commit 680e19c

File tree

1 file changed

+4
-28
lines changed

1 file changed

+4
-28
lines changed

ci/manylinux-build-deps

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ yum install -y fontconfig-devel libjpeg-turbo-devel libpng-devel \
2525
libuuid-devel librsvg2-devel \
2626
libX11-devel mesa-libEGL-devel mesa-libGLES-devel \
2727
wayland-devel wayland-protocols-devel \
28-
harfbuzz brotli-devel, gperf
28+
harfbuzz brotli-devel gperf
29+
30+
BUILD_DIR=$PWD
2931

3032
# GLFW
3133
if [[ "$BUILD_GLFW" == "1" ]]; then
@@ -83,11 +85,7 @@ if [[ "$BUILD_FREETYPE" == "1" ]]; then
8385
# Build static version
8486
./configure --prefix=/usr/local --enable-freetype-config --enable-static --disable-shared
8587
make clean && make -j3 && make install
86-
87-
88-
# Make sure the static library is available for linking
8988
cp /usr/local/lib/libfreetype.a /usr/local/lib/
90-
9189
cd ../
9290

9391
# Force statically compiled freetype
@@ -113,33 +111,11 @@ if [[ "$BUILD_FREETYPE" == "1" ]]; then
113111

114112
make -j3 && make install
115113

116-
# # Verify fontconfig is using our FreeType
117-
# echo "fontconfig dependencies:"
118-
# ldd /usr/local/lib/libfontconfig.so | grep freetype || echo "No freetype dependency found"
119-
#
120-
# cd ../
121-
#
122-
# # Step 3: Update system library paths to prefer our versions
123-
# echo "Setting up library paths..."
124-
#
125-
# # Create symlinks so the system finds our libraries first
126-
# ln -sf /usr/local/lib/libfreetype.so.6 /usr/lib64/libfreetype.so.6 || true
127-
# ln -sf /usr/local/lib/libfreetype.so /usr/lib64/libfreetype.so || true
128-
# ln -sf /usr/local/lib/libfontconfig.so.1 /usr/lib64/libfontconfig.so.1 || true
129-
# ln -sf /usr/local/lib/libfontconfig.so /usr/lib64/libfontconfig.so || true
130-
#
131-
# # Update ld cache
132-
# echo "/usr/local/lib" > /etc/ld.so.conf.d/custom-libs.conf
133-
# ldconfig
134-
#
135-
# # Set build environment
136-
# export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
137-
# export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
138-
139114
else
140115
yum install -y freetype-devel
141116
fi
142117

118+
cd $BUILD_DIR
143119
pwd
144120
ls
145121

0 commit comments

Comments
 (0)