diff options
| author | leot <leot@pkgsrc.org> | 2019-01-14 20:20:22 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2019-01-14 20:20:22 +0000 |
| commit | efa8a34e9deb67b18d6d7ffe26f9d08775bb6027 (patch) | |
| tree | 7302b8e706abec48ab3642d2d1d7c0ff7e37175f /editors | |
| parent | 6418d3f7171756bdcf7da47d98c5a5174a2340b5 (diff) | |
| download | pkgsrc-efa8a34e9deb67b18d6d7ffe26f9d08775bb6027.tar.gz | |
vim-gtk3: Fix gtk3 build after gtk3 3.24.1 update
vim-gtk3 was affected by a problem similar to PR pkg/53688, and
the test failed to recognize gtk3 due `undefined reference to
`epoxy_has_glx'' when `checking for GTK - version >= 3.0.0' in the
configure phase because instead of linking to pkgsrc libepoxy it
linked against builtin libepoxy. Despite that it successfully
built without gtk3 support but gvim failed at run time with
`E25: GUI cannot be used: Not enabled at compile time' error.
Sort x11 bl3 includes so instead of failing at run time it fails
at build time when linking vim.
Add a kludge to override `--x-libraries' and `--x-includes' passed
by x11.buildlink3.mk to avoid linking against builtin libepoxy and
fix gtk3 support.
Thanks to and discussed with <rhialto> and <morr>!
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim-gtk3/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/editors/vim-gtk3/Makefile b/editors/vim-gtk3/Makefile index dc1d1b26a61..2433006bbff 100644 --- a/editors/vim-gtk3/Makefile +++ b/editors/vim-gtk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2018/11/14 22:21:24 kleink Exp $ +# $NetBSD: Makefile,v 1.13 2019/01/14 20:20:22 leot Exp $ PKGNAME= vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL} PKGREVISION= 2 @@ -40,9 +40,16 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/gtk3/buildlink3.mk" + +# XXX: `--x-libraries' and `--x-includes' are injected to CONFIGURE_ARGS via +# XXX: mk/x11.buildlink3.mk. Override them by redefining them to NONE in order +# XXX: to avoid picked up possible undesidered libraries similarly to +# XXX: PR pkg/53688. +CONFIGURE_ARGS+= --x-libraries=NONE +CONFIGURE_ARGS+= --x-includes=NONE .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |