mirror of
https://github.com/servo/servo.git
synced 2025-08-08 15:05:35 +01:00
Build Fontconfig 2.11 in-tree on Linux
After applying this patch, on Linux you will need to ../configure make clean-rust-azure clean-fontconfig clean-rust-fontconfig Fixes #1752.
This commit is contained in:
parent
ab72c473cd
commit
ff189fca9b
7 changed files with 27 additions and 5 deletions
10
configure
vendored
10
configure
vendored
|
@ -524,6 +524,7 @@ if [ $CFG_OSTYPE = "unknown-linux-gnu" ]
|
|||
then
|
||||
CFG_SUBMODULES="\
|
||||
platform/linux/rust-xlib \
|
||||
platform/linux/fontconfig \
|
||||
support/glfw/glfw \
|
||||
support/glfw/glfw-rs \
|
||||
platform/linux/rust-fontconfig \
|
||||
|
@ -621,7 +622,7 @@ then
|
|||
cd ${CFG_BUILD_DIR}
|
||||
fi
|
||||
|
||||
#fontconfig expects to use an installed freetype, but we want to override that behavior to use our version
|
||||
# fontconfig expects to use an installed freetype, but we want to use our version on Android
|
||||
if [ $CFG_OSTYPE = "linux-androideabi" ]
|
||||
then
|
||||
export FREETYPE_CFLAGS="-I${CFG_SRC_DIR}src/platform/android/libfreetype2/include -I${CFG_BUILD_DIR}src/platform/android/libfreetype2/include"
|
||||
|
@ -681,6 +682,13 @@ do
|
|||
CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-zlib"
|
||||
CONFIGURE_ARGS="${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}"
|
||||
;;
|
||||
platform/linux/fontconfig)
|
||||
CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/autogen.sh"
|
||||
CONFIGURE_ARGS="${CONFIGURE_ARGS} --sysconfdir=/etc"
|
||||
CONFIGURE_ARGS="${CONFIGURE_ARGS} --localstatedir=/var"
|
||||
CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-shared" # work around Rust #12557
|
||||
CONFIGURE_ARGS="${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}"
|
||||
;;
|
||||
platform/android/fontconfig)
|
||||
CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/autogen.sh"
|
||||
CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux-androideabi"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue