diff options
| author | dbj <dbj@pkgsrc.org> | 2020-12-14 08:46:08 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2020-12-14 08:46:08 +0000 |
| commit | 1e905b68acc0b62d813ee008ca19ce965efe3e60 (patch) | |
| tree | d165ff4867ca32295daed78a756cfa9219211447 /x11/tk | |
| parent | 09076fcb5143015d91e247a87330cb04d99a5142 (diff) | |
| download | pkgsrc-1e905b68acc0b62d813ee008ca19ce965efe3e60.tar.gz | |
x11/tk: don't pull in pthreads when threads are disabled
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/Makefile | 4 | ||||
| -rw-r--r-- | x11/tk/options.mk | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 80af3b52d1d..143f5375666 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2020/08/17 20:18:01 leot Exp $ +# $NetBSD: Makefile,v 1.89 2020/12/14 08:46:08 dbj Exp $ DISTNAME= tk${TK_VERSION}-src PKGNAME= tk-${TK_VERSION} @@ -24,7 +24,6 @@ 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 -PTHREAD_OPTS+= require PKGCONFIG_OVERRIDE+= unix/tk.pc.in @@ -46,5 +45,4 @@ PLIST_SUBST+= SONUM=${TK_SONUM} PLIST_SUBST+= BASEVER=${TK_BASEVER} .include "../../lang/tcl/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/options.mk b/x11/tk/options.mk index fef1754f371..7c9004a251e 100644 --- a/x11/tk/options.mk +++ b/x11/tk/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2020/03/26 22:02:29 joerg Exp $ +# $NetBSD: options.mk,v 1.8 2020/12/14 08:46:08 dbj Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tk PKG_SUPPORTED_OPTIONS= threads debug xft2 @@ -33,6 +33,7 @@ CONFIGURE_ARGS+= --enable-symbols .if !empty(PKG_OPTIONS:Mthreads) CONFIGURE_ARGS+= --enable-threads +PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" .else CONFIGURE_ARGS+= --disable-threads |