From 4c8a900452a4afdc6474b3d7bd00c700afde18ac Mon Sep 17 00:00:00 2001 From: mcuee Date: Tue, 22 Nov 2022 06:56:37 +0800 Subject: [PATCH 1/2] Remove the needs of readline under macOS This commmit updates build.sh to remove the needs of GNU Readline under macOS, after the merge of PR #1185. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 110b6aa9..d5685a02 100755 --- a/build.sh +++ b/build.sh @@ -53,9 +53,9 @@ case "${ostype}" in # Apple M1 (may be new version of homebrew also) if [ -d /opt/homebrew ] then - build_flags="${build_flags} -D CMAKE_C_FLAGS=-I/opt/homebrew/include -D CMAKE_EXE_LINKER_FLAGS=-L/opt/homebrew/Cellar -D HAVE_LIBREADLINE:FILEPATH=/opt/homebrew/opt/readline/lib/libreadline.dylib" + build_flags="${build_flags} -D CMAKE_C_FLAGS=-I/opt/homebrew/include -D CMAKE_EXE_LINKER_FLAGS=-L/opt/homebrew/Cellar" else - build_flags="${build_flags} -D CMAKE_C_FLAGS=-I/usr/local/include -D CMAKE_EXE_LINKER_FLAGS=-L/usr/local/Cellar -D HAVE_LIBREADLINE:FILEPATH=/usr/local/opt/readline/lib/libreadline.dylib" + build_flags="${build_flags} -D CMAKE_C_FLAGS=-I/usr/local/include -D CMAKE_EXE_LINKER_FLAGS=-L/usr/local/Cellar" fi fi ;; From b1b8d9515427c540d157ea51286abafec1f4a3c2 Mon Sep 17 00:00:00 2001 From: mcuee Date: Tue, 22 Nov 2022 06:59:29 +0800 Subject: [PATCH 2/2] Update build.yml to remove readline under macOS This commmit updates github action to remove the needs of GNU Readline under macOS, after the merge of PR avrdudes#1185. --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 030f7ca0..dbe23e64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,7 +169,6 @@ jobs: -D CMAKE_EXE_LINKER_FLAGS=-L/usr/local/Cellar -D DEBUG_CMAKE=1 -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - -D HAVE_LIBREADLINE:FILEPATH=/usr/local/opt/readline/lib/libreadline.dylib -B build - name: Build run: cmake --build build