Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src + cleanup removal of -DUSE_NBSD_THREADLIB usage
details: https://anonhg.NetBSD.org/src/rev/2d3d994f3343
branches: trunk
changeset: 573168:2d3d994f3343
user: rtr <rtr%NetBSD.org@localhost>
date: Fri Jan 21 05:15:36 2005 +0000
description:
+ cleanup removal of -DUSE_NBSD_THREADLIB usage
diffstat:
share/mk/bsd.x11.mk | 5 +----
x11/Xserver/GL/dri/mga_dri/Makefile | 4 ++--
x11/Xserver/GL/dri/radeon_dri/Makefile | 4 ++--
x11/lib/GL/Makefile | 4 ++--
x11/lib/OSmesa/Makefile | 4 ++--
x11/lib/X11/Makefile.libx11 | 4 ++--
x11/lib/XRes/Makefile | 4 ++--
x11/lib/XTrap/Makefile | 4 ++--
x11/lib/Xau/Makefile | 4 ++--
x11/lib/Xcursor/Makefile | 4 ++--
x11/lib/Xdmcp/Makefile | 4 ++--
x11/lib/Xext/Makefile | 4 ++--
x11/lib/Xfontcache/Makefile | 4 ++--
x11/lib/Xft/Makefile | 4 ++--
x11/lib/Xft1/Makefile | 4 ++--
x11/lib/Xi/Makefile | 4 ++--
x11/lib/Xinerama/Makefile | 4 ++--
x11/lib/Xmu/Makefile | 4 ++--
x11/lib/Xp/Makefile | 4 ++--
x11/lib/Xrandr/Makefile | 4 ++--
x11/lib/Xrender/Makefile | 4 ++--
x11/lib/Xt/Makefile | 4 ++--
x11/lib/Xtst/Makefile | 4 ++--
x11/lib/Xv/Makefile | 4 ++--
x11/lib/XvMC/Makefile | 4 ++--
x11/lib/Xxf86dga/Makefile | 4 ++--
x11/lib/fontconfig/src/Makefile | 4 ++--
x11/lib/freetype2/Makefile | 4 ++--
x11/lib/xlibi18n/Makefile.xlibi18n | 4 ++--
29 files changed, 57 insertions(+), 60 deletions(-)
diffs (truncated from 523 to 300 lines):
diff -r 61b536377a65 -r 2d3d994f3343 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk Fri Jan 21 05:04:23 2005 +0000
+++ b/share/mk/bsd.x11.mk Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.44 2005/01/11 10:39:47 tron Exp $
+# $NetBSD: bsd.x11.mk,v 1.45 2005/01/21 05:15:36 rtr Exp $
.include <bsd.init.mk>
@@ -13,9 +13,6 @@
X11FLAGS.THREADS= -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API \
-DXNO_MTSAFE_PWDAPI
-# THREADS_DEFINES for libraries
-X11FLAGS.THREADLIB= ${X11FLAGS.THREADS}
-
# CONNECTION_FLAGS
X11FLAGS.CONNECTION= -DTCPCONN -DUNIXCONN -DHAS_STICKY_DIR_BIT \
-DHAS_FCHOWN
diff -r 61b536377a65 -r 2d3d994f3343 x11/Xserver/GL/dri/mga_dri/Makefile
--- a/x11/Xserver/GL/dri/mga_dri/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/Xserver/GL/dri/mga_dri/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/03/06 10:30:26 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/21 05:15:36 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -123,7 +123,7 @@
SRCS= ${SRCS.dri} ${SRCS.drm} ${SRCS.mesa} ${SRCS.common} ${SRCS.mga}
-CPPFLAGS+= ${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADLIB} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+CPPFLAGS+= ${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADS} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
LDADD= -lm
DPADD= ${LIBM}
diff -r 61b536377a65 -r 2d3d994f3343 x11/Xserver/GL/dri/radeon_dri/Makefile
--- a/x11/Xserver/GL/dri/radeon_dri/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/Xserver/GL/dri/radeon_dri/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/03/06 10:30:26 rtr Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/21 05:15:36 rtr Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -127,7 +127,7 @@
SRCS= ${SRCS.dri} ${SRCS.drm} ${SRCS.mesa} ${SRCS.common} ${SRCS.radeon}
-CPPFLAGS+= ${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADLIB} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+CPPFLAGS+= ${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADS} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
LDADD= -lm
DPADD= ${LIBM}
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/GL/Makefile
--- a/x11/lib/GL/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/GL/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/05 01:28:48 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -119,7 +119,7 @@
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${X11SRCDIR.xc}/lib/GL/include \
-I${X11SRCDIR.xc}/extras/Mesa/src \
- ${X11FLAGS.THREADLIB} -DGLXEXT -DGLX_USE_MESA
+ ${X11FLAGS.THREADS} -DGLXEXT -DGLX_USE_MESA
LIBDPLIBS= Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/OSmesa/Makefile
--- a/x11/lib/OSmesa/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/OSmesa/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/08/05 01:28:48 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/21 05:15:36 rtr Exp $
NOLINT= 1 # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
@@ -55,7 +55,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/lib/GL/include \
-I${X11SRCDIR.xc}/extras/Mesa/src \
- ${X11FLAGS.THREADLIB} \
+ ${X11FLAGS.THREADS} \
-DGLXEXT -DGLX_USE_MESA
.if ${MACHINE_ARCH} == "i386"
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/X11/Makefile.libx11
--- a/x11/lib/X11/Makefile.libx11 Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/X11/Makefile.libx11 Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.4 2003/09/30 06:41:30 lukem Exp $
+# $NetBSD: Makefile.libx11,v 1.5 2005/01/21 05:15:36 rtr Exp $
LIB= X11
.PATH: ${X11SRCDIR.xc}/lib/${LIB}
@@ -80,7 +80,7 @@
lcDB.c lcDefConv.c lcFile.c lcGeneric.c lcInit.c lcPrTxt.c \
lcPubWrap.c lcPublic.c lcRM.c lcStd.c lcTxtPr.c lcUTF8.c lcUtil.c
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -I. -DHAS_SNPRINTF -DLIBX11 -DPOSTLOCALELIBDIR=\"lib\"
CMS_DEFINES= -DXCMSDB=\"${X11LIBDIR}/Xcms.txt\"
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/XRes/Makefile
--- a/x11/lib/XRes/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/XRes/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/04/28 14:17:57 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -14,7 +14,7 @@
XRes.3 XResQueryExtension.3 \
XRes.3 XResQueryVersion.3
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/XTrap/Makefile
--- a/x11/lib/XTrap/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/XTrap/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/08/05 01:28:48 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
SRCS= XECallBcks.c XEConTxt.c XEDsptch.c XEPrInfo.c XERqsts.c \
XEStrMap.c XETrapInit.c XEWrappers.c
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS.XEWrappers.c= -I${X11SRCDIR.xc}/lib/Xt -I${DESTDIR}${X11INCDIR}/X11
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xau/Makefile
--- a/x11/lib/Xau/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xau/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/06 03:05:39 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@
INCS= Xauth.h
INCSDIR=${X11INCDIR}/X11
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xcursor/Makefile
--- a/x11/lib/Xcursor/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xcursor/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/08/05 01:28:48 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
MAN= Xcursor.3
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -DICONDIR=\"${X11LIBDIR}/icons\"
LIBDPLIBS=\
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xdmcp/Makefile
--- a/x11/lib/Xdmcp/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xdmcp/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/06 03:05:39 rtr Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -14,7 +14,7 @@
INCS= Xdmcp.h
INCSDIR=${X11INCDIR}/X11
-CPPFLAGS+=${X11FLAGS.THREADLIB}
+CPPFLAGS+=${X11FLAGS.THREADS}
CPPFLAGS+=-DHASXDMAUTH
CPPFLAGS.Fill.c= ${X11FLAGS.CONNECTION}
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xext/Makefile
--- a/x11/lib/Xext/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xext/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
SRCS= DPMS.c MITMisc.c XAppgroup.c XEVI.c XLbx.c XMultibuf.c XSecurity.c \
XShape.c XShm.c XSync.c XTestExt1.c Xcup.c Xdbe.c extutil.c globals.c
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -I${X11SRCDIR.xc}/lib/X11
LIBDPLIBS= X11 ${.CURDIR}/../X11/dynamic
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xfontcache/Makefile
--- a/x11/lib/Xfontcache/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xfontcache/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/04/28 14:17:57 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -14,7 +14,7 @@
Xfontcache.3 FontCacheQueryExtension.3 \
Xfontcache.3 FontCacheQueryVersion.3
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xft/Makefile
--- a/x11/lib/Xft/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xft/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/29 05:18:25 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -14,7 +14,7 @@
MAN= Xft.3
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
# XXX it would be really swell if SCRIPTS was available from bsd.lib.mk
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xft1/Makefile
--- a/x11/lib/Xft1/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xft1/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/29 05:18:26 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/21 05:15:36 rtr Exp $
NOCHECKVER= yes # we want to install an older version ...
MKLINKLIB= no
@@ -13,7 +13,7 @@
xftglyphs.c xftinit.c xftlist.c xftmatch.c xftmatrix.c \
xftname.c xftpat.c xftrender.c xftstr.c xftxlfd.c
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
.include <bsd.x11.mk>
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xi/Makefile
--- a/x11/lib/Xi/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xi/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/08/05 01:28:48 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -14,7 +14,7 @@
XSetMMap.c XSetMode.c XSndExEv.c XStFocus.c XUngrDev.c \
XUngrDvB.c XUngrDvK.c
-CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= ${X11FLAGS.THREADS}
LIBDPLIBS=\
Xext ${.CURDIR}/../Xext \
diff -r 61b536377a65 -r 2d3d994f3343 x11/lib/Xinerama/Makefile
--- a/x11/lib/Xinerama/Makefile Fri Jan 21 05:04:23 2005 +0000
+++ b/x11/lib/Xinerama/Makefile Fri Jan 21 05:15:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/10/20 05:12:41 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
Home |
Main Index |
Thread Index |
Old Index