bonsai/repo
4
0
Fork 0
forked from kiss-community/repo
Code Issues 28 Pull Requests 2 Projects Releases Activity

freetype-harfbuzz: Fix build.

Browse Source 
Harfbuzz wasn't linking to Freetype if it was not already installed.
This commit is contained in:
Dylan Araps 2020-07-28 00:19:19 +03:00
parent e6130bf955
commit baf0829aaf
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extra/freetype-harfbuzz/build
View File

@ -14,18 +14,23 @@ build_freetype() (
) )
build_harfbuzz() ( build_harfbuzz() (
# Point Harfbuzz to the Freetype files.
export CFLAGS="$CFLAGS -I$1/usr/include/freetype2"
export CXXFLAGS="$CXXFLAGS -I$1/usr/include/freetype2"
export LDFLAGS="$LDFLAGS -L$1/usr/lib"
cd harfbuzz cd harfbuzz
export DESTDIR="$1" export DESTDIR="$1"
meson \ meson \
--default-library=both \
--prefix=/usr \ --prefix=/usr \
-Dfreetype=enabled \
-Dglib=enabled \ -Dglib=enabled \
-Dfreetype=enabled \
-Ddefault_library=both \
-Dicu=disabled \ -Dicu=disabled \
-Dbenchmark=disabled \ -Dbenchmark=disabled \
-Dtests=disabled \ -Dtests=disabled \
-Dpkg_config_path="$1/usr/lib/pkgconfig" \
. output . output
ninja -C output ninja -C output
@ -33,11 +38,6 @@ build_harfbuzz() (
) )
build_freetype "$1" no build_freetype "$1" no
# Point Harfbuzz to the Freetype files.
export FREETYPE_CFLAGS="-I$PWD/freetype/include"
export FREETYPE_LIBS="-L$1/usr/lib -lfreetype"
build_harfbuzz "$1" build_harfbuzz "$1"
# Point Freetype to the Harfbuzz files. # Point Freetype to the Harfbuzz files.

2
extra/freetype-harfbuzz/version
View File

@ -1 +1 @@
2.10.2+2.7.0 1 2.10.2+2.7.0 2