CVS commit: pkgsrc/x11/tk

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Mon Dec 14 08:46:08 UTC 2020

Modified Files:
        pkgsrc/x11/tk: Makefile options.mk

Log Message:
x11/tk: don't pull in pthreads when threads are disabled


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/x11/tk/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/tk/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/tk/Makefile
diff -u pkgsrc/x11/tk/Makefile:1.88 pkgsrc/x11/tk/Makefile:1.89
--- pkgsrc/x11/tk/Makefile:1.88 Mon Aug 17 20:18:01 2020
+++ pkgsrc/x11/tk/Makefile      Mon Dec 14 08:46:08 2020
@@ -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_
 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"

Index: pkgsrc/x11/tk/options.mk
diff -u pkgsrc/x11/tk/options.mk:1.7 pkgsrc/x11/tk/options.mk:1.8
--- pkgsrc/x11/tk/options.mk:1.7        Thu Mar 26 22:02:29 2020
+++ pkgsrc/x11/tk/options.mk    Mon Dec 14 08:46:08 2020
@@ -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