Seems to work but when it comes to autotools, I don't know what I'm doing.
Fixes https://github.com/geany/geany/issues/4179 (at least partially) You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany/pull/4181
-- Commit Summary --
* Use builtin regex on macOS for performance reasons
-- File Changes --
M configure.ac (23) M meson.build (6)
-- Patch Links --
https://github.com/geany/geany/pull/4181.patch https://github.com/geany/geany/pull/4181.diff
I hope it does the right thing. It seems to work on macOS and in the CI builds I checked that ``` checking for regcomp... yes ``` is present for the autotools build and ``` Checking for function "regcomp" with dependencies glib-2.0, gmodule-2.0, gtk+-3.0: YES ``` for the meson build.
@eht16 I suspect the Windows CI failure comes from the fact that the docker image has already been updated but https://github.com/geany/geany/pull/4088 hasn't been merged yet, right?
I hope it does the right thing. It seems to work on macOS and in the CI builds I checked that
checking for regcomp... yesis present for the autotools build and
Checking for function "regcomp" with dependencies glib-2.0, gmodule-2.0, gtk+-3.0: YESfor the meson build.
Looks good to me. But I'm also not an Autotools expert. Maybe @b4n could have a look.
@eht16 I suspect the Windows CI failure comes from the fact that the docker image has already been updated but #4088 hasn't been merged yet, right?
Yes exactly, we can ignore this for now. And we see in the logs, Geany got built fine.
@techee pushed 1 commit.
7a8537a7ebd8eedc03f8db2b8faec292ed17c6af Use builtin regex on macOS for performance reasons
I just modified the meson build to use `host_machine` instead of `target_machine` similarly to https://github.com/geany/geany/commit/9a507b47bc514514d15838d0dbf442317ed987...
@techee pushed 1 commit.
4cd4fec6ab4ce5832d706c6f4763b1df4bc172e2 Use builtin regex on macOS for performance reasons
@b4n pushed 1 commit.
0b42100188a522f1dc5b52cab82b2013ba5b2792 fixup! Use builtin regex on macOS for performance reasons
@techee I added a fixup commit. The main fix is to use HOST rather than TARGET, because TARGET is a weird thing while HOST is what you want -- although in practice TARGET is usually gonna be the same as HOST anyway. Otherwise, should be fine. You (or I) can squash those commits before merging.
github-comments@lists.geany.org