From 995668ac027f8737aba8be3b1a567b108e1a1534 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Thu, 18 Feb 2021 23:46:29 +0100 Subject: [PATCH] Unbreak macOS build (#7313) * Bump base https://github.com/koreader/koreader-base/pull/1308 https://github.com/koreader/koreader-base/pull/1310 * Include bison in macOS build deps Apparently something in gettext is possibly unhappy with the hilariously outdated stock version (2.3). --- .github/workflows/build.yml | 4 ++-- base | 2 +- doc/Building.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bd7d2554..2133efd9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,10 +22,10 @@ jobs: - name: Homebrew install dependencies # Compared to the README, adds ccache for faster compilation times and removes sh5sum to prevent some conflict with coreutils # Compared to the emulator, adds p7zip and removes sdl2. - run: brew install ccache nasm ragel binutils coreutils libtool autoconf automake cmake makedepend lua@5.1 luarocks gettext gnu-getopt pkg-config wget p7zip + run: brew install ccache nasm ragel binutils coreutils libtool autoconf automake cmake makedepend lua@5.1 luarocks gettext gnu-getopt pkg-config wget bison p7zip - name: Building in progress… - run: export MACOSX_DEPLOYMENT_TARGET=10.14 PATH="$(brew --prefix)/opt/gettext/bin:$(brew --prefix)/opt/gnu-getopt/bin:${PATH}" && ./kodev release macos + run: export MACOSX_DEPLOYMENT_TARGET=10.14 PATH="$(brew --prefix)/opt/gettext/bin:$(brew --prefix)/opt/gnu-getopt/bin:$(brew --prefix)/opt/bison/bin:${PATH}" && ./kodev release macos - name: Uploading artifacts uses: actions/upload-artifact@v2 diff --git a/base b/base index d980ec9c4..fe39ae12a 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit d980ec9c487a0ab1508b8d7c7c6a46f253fa17a8 +Subproject commit fe39ae12accdae7210c4e6e4912f3d7f5f920070 diff --git a/doc/Building.md b/doc/Building.md index b59f70697..da209a063 100644 --- a/doc/Building.md +++ b/doc/Building.md @@ -41,12 +41,12 @@ Install the prerequisites using [Homebrew](https://brew.sh/): ``` brew install nasm ragel binutils coreutils libtool autoconf automake cmake makedepend \ -sdl2 lua@5.1 luarocks gettext pkg-config wget gnu-getopt grep +sdl2 lua@5.1 luarocks gettext pkg-config wget gnu-getopt grep bison ``` -You will also have to ensure Homebrew's gettext, gnu-getopt, & grep are in your path, e.g., via +You will also have to ensure Homebrew's gettext, gnu-getopt, bison & grep are in your path, e.g., via ``` -export PATH="$(brew --prefix)/opt/gettext/bin:$(brew --prefix)/opt/gnu-getopt/bin:$(brew --prefix)/opt/grep/libexec/gnubin:${PATH}" +export PATH="$(brew --prefix)/opt/gettext/bin:$(brew --prefix)/opt/gnu-getopt/bin:$(brew --prefix)/opt/bison/bin:$(brew --prefix)/opt/grep/libexec/gnubin:${PATH}" ``` See also `brew info gettext` for details on how to make that permanent in your shell.