Skip to content

Commit 17ef0d3

Browse files
committed
WIP use Homebrew libiconv
1 parent 21a4147 commit 17ef0d3

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

.github/workflows/macvim-buildtest.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ jobs:
222222
sed -i.bak -f ci/config.mk.optimized.sed src/auto/config.mk
223223
fi
224224
225+
# Use Homebrew libiconv since Apple iconv is broken since macOS 14
226+
sed -i.bak -f ci/config.mk.brew-libiconv.sed src/auto/config.mk
227+
225228
- name: Modify configure result
226229
if: inputs.publish
227230
run: |

ci/config.mk.brew-libiconv.sed

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Use Homebrew libiconv to work around broken Apple version. Use static linking
2+
# as we don't want our binary releases to pull in third-party dependencies.
3+
#
4+
# If gettext is configured in the build, this only works libintl is also built
5+
# against Homebrew libiconv (which is not the default in Homebrew).
6+
/^CFLAGS[[:blank:]]*=/s/$/ -I\/opt\/homebrew\/opt\/libiconv\/include/
7+
/^LIBS[[:blank:]]*=/s/-liconv/\/opt\/homebrew\/opt\/libiconv\/lib\/libiconv.a/

0 commit comments

Comments
 (0)