diff options
| author | dbj <dbj@pkgsrc.org> | 2020-12-14 08:46:56 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2020-12-14 08:46:56 +0000 |
| commit | 1e02cf2b30f339476bfb01236802d54f93e43763 (patch) | |
| tree | ed14d1fabed67d80ca8de2950def6a5c57520840 /x11/tk | |
| parent | 1e905b68acc0b62d813ee008ca19ce965efe3e60 (diff) | |
| download | pkgsrc-1e02cf2b30f339476bfb01236802d54f93e43763.tar.gz | |
x11/tk: avoid x11 when building aqua
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/Makefile | 4 | ||||
| -rw-r--r-- | x11/tk/options.mk | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 143f5375666..03b19247059 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2020/12/14 08:46:08 dbj Exp $ +# $NetBSD: Makefile,v 1.90 2020/12/14 08:46:56 dbj Exp $ DISTNAME= tk${TK_VERSION}-src PKGNAME= tk-${TK_VERSION} @@ -21,8 +21,6 @@ GNU_CONFIGURE= yes CONFIGURE_DIRS= unix BUILD_DIRS= ${CONFIGURE_DIRS} CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q} CONFIGURE_ENV+= LIB_RUNTIME_DIR=${PREFIX}/lib PKGCONFIG_OVERRIDE+= unix/tk.pc.in diff --git a/x11/tk/options.mk b/x11/tk/options.mk index 7c9004a251e..d03240031da 100644 --- a/x11/tk/options.mk +++ b/x11/tk/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2020/12/14 08:46:08 dbj Exp $ +# $NetBSD: options.mk,v 1.9 2020/12/14 08:46:56 dbj Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tk PKG_SUPPORTED_OPTIONS= threads debug xft2 @@ -20,8 +20,11 @@ PKG_SUPPORTED_OPTIONS+= aqua # Otherwise some X11 headers are installed and will break X11 compatibility. .if !empty(PKG_OPTIONS:Maqua) CONFIGURE_ARGS+= --enable-aqua +CONFIGURE_ARGS+= --without-x PLIST.aqua= yes .else +CONFIGURE_ARGS+= --x-includes=${X11BASE}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q} .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXScrnSaver/buildlink3.mk" |