Mon Dec 14 08:46:08 2020 UTC ()
x11/tk: don't pull in pthreads when threads are disabled


(dbj)
diff -r1.88 -r1.89 pkgsrc/x11/tk/Makefile
diff -r1.7 -r1.8 pkgsrc/x11/tk/options.mk
cvs diff -r1.88 -r1.89 pkgsrc/x11/tk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/tk/Makefile 2020/08/17 20:18:01 1.88
+++ pkgsrc/x11/tk/Makefile 2020/12/14 08:46:08 1.89
@@ -1,50 +1,48 @@ @@ -1,50 +1,48 @@
1# $NetBSD: Makefile,v 1.88 2020/08/17 20:18:01 leot Exp $ 1# $NetBSD: Makefile,v 1.89 2020/12/14 08:46:08 dbj Exp $
2 2
3DISTNAME= tk${TK_VERSION}-src 3DISTNAME= tk${TK_VERSION}-src
4PKGNAME= tk-${TK_VERSION} 4PKGNAME= tk-${TK_VERSION}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= x11 lang 6CATEGORIES= x11 lang
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.tcl.tk/ 10HOMEPAGE= https://www.tcl.tk/
11COMMENT= Graphical toolkit for TCL 11COMMENT= Graphical toolkit for TCL
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14.include "../../x11/tk/Makefile.version" 14.include "../../x11/tk/Makefile.version"
15 15
16WRKSRC= ${WRKDIR}/tk${TK_VERSION} 16WRKSRC= ${WRKDIR}/tk${TK_VERSION}
17 17
18USE_GCC_RUNTIME= yes 18USE_GCC_RUNTIME= yes
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CONFIGURE_DIRS= unix 21CONFIGURE_DIRS= unix
22BUILD_DIRS= ${CONFIGURE_DIRS} 22BUILD_DIRS= ${CONFIGURE_DIRS}
23CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib 23CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
24CONFIGURE_ARGS+= --x-includes=${X11BASE}/include 24CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
25CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q} 25CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
26CONFIGURE_ENV+= LIB_RUNTIME_DIR=${PREFIX}/lib 26CONFIGURE_ENV+= LIB_RUNTIME_DIR=${PREFIX}/lib
27PTHREAD_OPTS+= require 
28 27
29PKGCONFIG_OVERRIDE+= unix/tk.pc.in 28PKGCONFIG_OVERRIDE+= unix/tk.pc.in
30 29
31TEST_TARGET= test 30TEST_TARGET= test
32 31
33.if defined(ABI) && ${ABI} == "64" 32.if defined(ABI) && ${ABI} == "64"
34CONFIGURE_ARGS+= --enable-64bit 33CONFIGURE_ARGS+= --enable-64bit
35.endif 34.endif
36 35
37.include "options.mk" 36.include "options.mk"
38 37
39SUBST_CLASSES+= tk-config 38SUBST_CLASSES+= tk-config
40SUBST_STAGE.tk-config= post-build 39SUBST_STAGE.tk-config= post-build
41SUBST_FILES.tk-config= unix/tkConfig.sh 40SUBST_FILES.tk-config= unix/tkConfig.sh
42SUBST_SED.tk-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|" 41SUBST_SED.tk-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|"
43SUBST_SED.tk-config+= -e "s|${WRKSRC}|${PREFIX}/include/tk|" 42SUBST_SED.tk-config+= -e "s|${WRKSRC}|${PREFIX}/include/tk|"
44 43
45PLIST_SUBST+= SONUM=${TK_SONUM} 44PLIST_SUBST+= SONUM=${TK_SONUM}
46PLIST_SUBST+= BASEVER=${TK_BASEVER} 45PLIST_SUBST+= BASEVER=${TK_BASEVER}
47 46
48.include "../../lang/tcl/buildlink3.mk" 47.include "../../lang/tcl/buildlink3.mk"
49.include "../../mk/pthread.buildlink3.mk" 
50.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/x11/tk/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/tk/options.mk 2020/03/26 22:02:29 1.7
+++ pkgsrc/x11/tk/options.mk 2020/12/14 08:46:08 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.7 2020/03/26 22:02:29 joerg Exp $ 1# $NetBSD: options.mk,v 1.8 2020/12/14 08:46:08 dbj Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.tk 3PKG_OPTIONS_VAR= PKG_OPTIONS.tk
4PKG_SUPPORTED_OPTIONS= threads debug xft2 4PKG_SUPPORTED_OPTIONS= threads debug xft2
5PKG_SUGGESTED_OPTIONS= threads 5PKG_SUGGESTED_OPTIONS= threads
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PLIST_VARS+= aqua 9PLIST_VARS+= aqua
10 10
11.if ${OPSYS} != "Darwin" 11.if ${OPSYS} != "Darwin"
12PKG_SUGGESTED_OPTIONS+= xft2 12PKG_SUGGESTED_OPTIONS+= xft2
13.else 13.else
14PKG_SUPPORTED_OPTIONS+= aqua 14PKG_SUPPORTED_OPTIONS+= aqua
@@ -23,25 +23,26 @@ CONFIGURE_ARGS+= --enable-aqua @@ -23,25 +23,26 @@ CONFIGURE_ARGS+= --enable-aqua
23PLIST.aqua= yes 23PLIST.aqua= yes
24.else 24.else
25.include "../../x11/libX11/buildlink3.mk" 25.include "../../x11/libX11/buildlink3.mk"
26.include "../../x11/libXext/buildlink3.mk" 26.include "../../x11/libXext/buildlink3.mk"
27.include "../../x11/libXScrnSaver/buildlink3.mk" 27.include "../../x11/libXScrnSaver/buildlink3.mk"
28.endif 28.endif
29 29
30.if !empty(PKG_OPTIONS:Mdebug) 30.if !empty(PKG_OPTIONS:Mdebug)
31CONFIGURE_ARGS+= --enable-symbols 31CONFIGURE_ARGS+= --enable-symbols
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mthreads) 34.if !empty(PKG_OPTIONS:Mthreads)
35CONFIGURE_ARGS+= --enable-threads 35CONFIGURE_ARGS+= --enable-threads
 36PTHREAD_OPTS+= require
36.include "../../mk/pthread.buildlink3.mk" 37.include "../../mk/pthread.buildlink3.mk"
37.else 38.else
38CONFIGURE_ARGS+= --disable-threads 39CONFIGURE_ARGS+= --disable-threads
39.endif 40.endif
40 41
41.if !empty(PKG_OPTIONS:Mxft2) 42.if !empty(PKG_OPTIONS:Mxft2)
42CONFIGURE_ARGS+= --enable-xft 43CONFIGURE_ARGS+= --enable-xft
43USE_TOOLS+= pkg-config 44USE_TOOLS+= pkg-config
44.include "../../x11/libXft/buildlink3.mk" 45.include "../../x11/libXft/buildlink3.mk"
45.else 46.else
46CONFIGURE_ARGS+= --disable-xft 47CONFIGURE_ARGS+= --disable-xft
47.endif 48.endif