branch: elpa/pdf-tools commit bc7c159c483da6047630d445cb6e1ae45384f9a0 Author: Vedang Manerikar <ved.maneri...@gmail.com> Commit: Vedang Manerikar <ved.maneri...@gmail.com>
Make sure pkg-config is correctly set in autobuild Also, simplify the config script for finding gnu-sed. Relates to: #160 --- .circleci/config.yml | 2 +- server/autobuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 636546de88..a8005ee94e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,7 +95,7 @@ jobs: - run: name: Add Cask and Gnu-SED to the Path command: | - echo 'export PATH="$HOME"/.cask/bin:"$(brew --prefix)"/opt/gnu-sed/libexec/gnubin:"$PATH"' >> "$BASH_ENV" + echo 'export PATH="$HOME"/.cask/bin:"$(brew --prefix gnu-sed)"/libexec/gnubin:"$PATH"' >> "$BASH_ENV" - install-pdf-tools-server workflows: diff --git a/server/autobuild b/server/autobuild index de42806fcc..4b33bfdb67 100755 --- a/server/autobuild +++ b/server/autobuild @@ -353,7 +353,7 @@ os_macos() { PKG_INSTALL_AS_ROOT= # brew installs libffi as keg-only, meaning we need to set # PKG_CONFIG_PATH manually so configure can find it - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:$(brew --prefix libffi)/lib/pkgconfig/" + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:$(brew --prefix libffi)/lib/pkgconfig/:$(brew --prefix zlib)/lib/pkgconfig/" elif which port >/dev/null 2>&1; then PKGCMD=port PKGARGS=install