Skip to content

Commit b82df0c

Browse files
committed
Repair linux build.
1 parent 00cfc62 commit b82df0c

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

build.sh

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ make install
115115
cd ..
116116
fi
117117

118-
if [ ! -d libffi-3.4.4 ]; then
119-
curl -L https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz -o libffi.tar.gz
118+
if [ ! -d libffi-3.4.6 ]; then
119+
curl -L https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz -o libffi.tar.gz
120120
tar -xf libffi.tar.gz
121-
cd libffi-3.4.4
121+
cd libffi-3.4.6
122122
./configure --prefix=${PREFIX} --disable-shared
123123
make -j$(nproc --all)
124124
make install
@@ -146,16 +146,6 @@ make install
146146
cd ..
147147
fi
148148

149-
if [ ! -d libffi-3.4.4 ]; then
150-
curl -L https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz -o libffi.tar.gz
151-
tar -xf libffi.tar.gz
152-
cd libffi-3.4.4
153-
./configure --prefix=${PREFIX} --disable-shared
154-
make -j$(nproc --all)
155-
make install
156-
cd ..
157-
fi
158-
159149
if [ ! -d libpng-1.6.39 ]; then
160150
curl -L http://downloads.sourceforge.net/project/libpng/libpng16/1.6.39/libpng-1.6.39.tar.xz -o libpng.tar.gz
161151
tar -xf libpng.tar.gz
@@ -231,8 +221,8 @@ curl -L https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.15.
231221
tar -xf fontconfig.tar.gz
232222
cd fontconfig-2.15.0
233223
./configure --prefix=${PREFIX} --disable-shared
234-
make -j$(nproc --all)
235-
make install
224+
make -j$(nproc --all) install || true
225+
echo ----- It is normal for fontconfig to fail to build the executables. The libs should be enough. -----
236226
cd ..
237227
fi
238228

0 commit comments

Comments
 (0)