Skip to content

Commit f60355c

Browse files
authored
Make sure xcb-proto is detected. tk needs to go after expat.
1 parent 7ac9dc5 commit f60355c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

build.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export "CFLAGS=-I${PREFIX}/include -fPIC"
3232
export "CXXFLAGS=-I${PREFIX}/include -fPIC"
3333
export "CPPFLAGS=-I${PREFIX}/include"
3434
export "LDFLAGS=-L${PREFIX}/lib"
35-
export "PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig"
35+
export "PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig"
3636

3737
mkdir -p dep-build
3838
cd dep-build
@@ -317,16 +317,6 @@ make install
317317
cd ../..
318318
fi
319319

320-
if [ ! -d tk8.6.13 ]; then
321-
curl -L http://downloads.sourceforge.net/project/tcl/Tcl/8.6.13/tk8.6.13-src.tar.gz -o tk.tar.gz
322-
tar -xf tk.tar.gz
323-
cd tk8.6.13/unix
324-
./configure --prefix=${PREFIX} --enable-shared=no --enable-threads --with-tcl=${PREFIX}/lib
325-
make -j$(nproc --all) "X11_LIB_SWITCHES=-l:libX11.a -l:libxcb.a -l:libXss.a -l:libfontconfig.a -l:libXft.a -l:libXext.a -l:libXrandr.a -l:libXau.a -l:libXrender.a -l:libXdmcp.a -l:libfreetype.a -l:libexpat.a -l:libpng.a -l:libharfbuzz.a -l:libX11.a -l:libxcb.a -l:libbz2.a"
326-
make install
327-
cd ../..
328-
fi
329-
330320
if [ ! -d expat-2.5.0 ]; then
331321
curl -L https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.gz -o expat.tar.gz
332322
tar -xf expat.tar.gz
@@ -337,6 +327,16 @@ make install
337327
cd ..
338328
fi
339329

330+
if [ ! -d tk8.6.13 ]; then
331+
curl -L http://downloads.sourceforge.net/project/tcl/Tcl/8.6.13/tk8.6.13-src.tar.gz -o tk.tar.gz
332+
tar -xf tk.tar.gz
333+
cd tk8.6.13/unix
334+
./configure --prefix=${PREFIX} --enable-shared=no --enable-threads --with-tcl=${PREFIX}/lib
335+
make -j$(nproc --all) "X11_LIB_SWITCHES=-l:libX11.a -l:libxcb.a -l:libXss.a -l:libfontconfig.a -l:libXft.a -l:libXext.a -l:libXrandr.a -l:libXau.a -l:libXrender.a -l:libXdmcp.a -l:libfreetype.a -l:libexpat.a -l:libpng.a -l:libharfbuzz.a -l:libX11.a -l:libxcb.a -l:libbz2.a"
336+
make install
337+
cd ../..
338+
fi
339+
340340
if [ ! -d mpdecimal-4.0.0 ]; then
341341
curl -L https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.0.tar.gz -o mpdecimal.tar.gz
342342
tar -xf mpdecimal.tar.gz

0 commit comments

Comments
 (0)