walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2729 from khaledhosny/autotools-pkg-config 

[autotools] Require pkg-config 0.28
This commit is contained in:
Khaled Hosny 2020-10-24 10:41:33 +02:00 committed by GitHub
parent 49ebb9ebdd 5adc1344a4
commit 69cc214c9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.circleci/config.yml
View File

@ -10,17 +10,6 @@ executors:
jobs: jobs:
macos-10_12_6-aat-fonts:
macos:
xcode: "9.0.1"
steps:
- checkout
- run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config freetype glib cairo python3 ninja
- run: pip3 install meson --upgrade
- run: meson build
- run: meson compile -Cbuild # or ninja -Cbuild
- run: meson test -Cbuild --print-errorlogs
macos-10_13_6-aat-fonts: macos-10_13_6-aat-fonts:
macos: macos:
xcode: "10.1.0" xcode: "10.1.0"
@ -31,6 +20,8 @@ jobs:
- run: meson build - run: meson build
- run: meson compile -Cbuild - run: meson compile -Cbuild
- run: meson test -Cbuild --print-errorlogs - run: meson test -Cbuild --print-errorlogs
- store_artifacts:
path: build/meson-logs/
macos-10_14_4-aat-fonts: macos-10_14_4-aat-fonts:
macos: macos:
@ -42,6 +33,8 @@ jobs:
- run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled
- run: meson compile -Cbuild - run: meson compile -Cbuild
- run: meson test -Cbuild --print-errorlogs - run: meson test -Cbuild --print-errorlogs
- store_artifacts:
path: build/meson-logs/
macos-10_15_3-aat-fonts: macos-10_15_3-aat-fonts:
macos: macos:
@ -53,6 +46,8 @@ jobs:
- run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled -Dgraphite=enabled -Dauto_features=enabled - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled -Dgraphite=enabled -Dauto_features=enabled
- run: meson compile -Cbuild - run: meson compile -Cbuild
- run: meson test -Cbuild --print-errorlogs - run: meson test -Cbuild --print-errorlogs
- store_artifacts:
path: build/meson-logs/
# will be dropped with autotools removal # will be dropped with autotools removal
distcheck: distcheck:
@ -170,7 +165,6 @@ workflows:
build: build:
jobs: jobs:
- macos-10_12_6-aat-fonts
- macos-10_13_6-aat-fonts - macos-10_13_6-aat-fonts
- macos-10_14_4-aat-fonts - macos-10_14_4-aat-fonts
- macos-10_15_3-aat-fonts - macos-10_15_3-aat-fonts

2
configure.ac
View File

@ -25,7 +25,7 @@ AM_PROG_CC_C_O
AC_PROG_CXX AC_PROG_CXX
AX_CXX_COMPILE_STDCXX(11) AX_CXX_COMPILE_STDCXX(11)
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
PKG_PROG_PKG_CONFIG([0.20]) PKG_PROG_PKG_CONFIG([0.28])
AM_MISSING_PROG([RAGEL], [ragel]) AM_MISSING_PROG([RAGEL], [ragel])
AM_MISSING_PROG([GIT], [git]) AM_MISSING_PROG([GIT], [git])