Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ cleanup removal of -DUSE_NBSD_THREADLIB usage

This commit is contained in:
rtr 2005-01-21 05:15:36 +00:00
parent d6bb93d348
commit 8c050b7c06
29 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/mk/bsd.x11.mk
View File

@ -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.VERSION= -DOSMAJORVERSION=1 -DOSMINORVERSION=6 # XXX
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

4
x11/Xserver/GL/dri/mga_dri/Makefile
View File

@ -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 @@ CPPFLAGS.${fn}+=-DX_BYTE_ORDER=${X_BYTE_ORDER}
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}

4
x11/Xserver/GL/dri/radeon_dri/Makefile
View File

@ -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 @@ CPPFLAGS.${fn}+=-DX_BYTE_ORDER=${X_BYTE_ORDER}
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}

4
x11/lib/GL/Makefile
View File

@ -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 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-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

4
x11/lib/OSmesa/Makefile
View File

@ -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+= ${X11FLAGS.DRI}
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"

4
x11/lib/X11/Makefile.libx11
View File

@ -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 @@ SRCS+= SetLocale.c imConv.c imKStoUCS.c lcCT.c lcCharSet.c lcConv.c \
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\"

4
x11/lib/XRes/Makefile
View File

@ -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 @@ MLINKS= XRes.3 XResQueryClientPixmapBytes.3 \
XRes.3 XResQueryExtension.3 \
XRes.3 XResQueryVersion.3
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
.include <bsd.x11.mk>
.include <bsd.lib.mk>

4
x11/lib/XTrap/Makefile
View File

@ -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 @@ LIB= XTrap
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

4
x11/lib/Xau/Makefile
View File

@ -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 @@ SRCS= AuDispose.c AuFileName.c AuGetAddr.c AuGetBest.c AuLock.c \
INCS= Xauth.h
INCSDIR=${X11INCDIR}/X11
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
.include <bsd.x11.mk>
.include <bsd.lib.mk>

4
x11/lib/Xcursor/Makefile
View File

@ -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 @@ INCSDIR=${X11INCDIR}/X11/Xcursor
MAN= Xcursor.3
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -DICONDIR=\"${X11LIBDIR}/icons\"
LIBDPLIBS=\

4
x11/lib/Xdmcp/Makefile
View File

@ -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 @@ SRCS= A8Eq.c AA16.c AA32.c AA8.c Alloc.c AofA8.c CA8.c CmpKey.c DA16.c \
INCS= Xdmcp.h
INCSDIR=${X11INCDIR}/X11
CPPFLAGS+=${X11FLAGS.THREADLIB}
CPPFLAGS+=${X11FLAGS.THREADS}
CPPFLAGS+=-DHASXDMAUTH
CPPFLAGS.Fill.c= ${X11FLAGS.CONNECTION}

4
x11/lib/Xext/Makefile
View File

@ -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 @@ LIB= Xext
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

4
x11/lib/Xfontcache/Makefile
View File

@ -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 @@ MLINKS= Xfontcache.3 FontCacheChangeCacheSettings.3 \
Xfontcache.3 FontCacheQueryExtension.3 \
Xfontcache.3 FontCacheQueryVersion.3
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
.include <bsd.x11.mk>
.include <bsd.lib.mk>

4
x11/lib/Xft/Makefile
View File

@ -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 @@ INCSDIR=${X11INCDIR}/X11/Xft
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

4
x11/lib/Xft1/Makefile
View File

@ -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 @@ SRCS= xftcfg.c xftcolor.c xftcore.c xftdbg.c xftdir.c xftdpy.c \
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>

4
x11/lib/Xi/Makefile
View File

@ -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 @@ SRCS= XAllowDv.c XChgDCtl.c XChgFCtl.c XChgKMap.c XChgKbd.c \
XSetMMap.c XSetMode.c XSndExEv.c XStFocus.c XUngrDev.c \
XUngrDvB.c XUngrDvK.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
LIBDPLIBS=\
Xext ${.CURDIR}/../Xext \

4
x11/lib/Xinerama/Makefile
View File

@ -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 @@ LIB= Xinerama
SRCS= Xinerama.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
.include <bsd.x11.mk>
.include <bsd.lib.mk>

4
x11/lib/Xmu/Makefile
View File

@ -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>
@ -21,7 +21,7 @@ INCS= Atoms.h CharSet.h CloseHook.h Converters.h CurUtil.h \
StdSel.h SysUtil.h WidgetNode.h WinUtil.h Xct.h Xmu.h
INCSDIR=${X11INCDIR}/X11/Xmu
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -DHAS_SNPRINTF
CPPFLAGS+= -DXTSTRINGDEFINES #XTODO is this correct?

4
x11/lib/Xp/Makefile
View File

@ -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>
@ -10,7 +10,7 @@ SRCS= XpAttr.c XpContext.c XpDoc.c XpExtUtil.c XpExtVer.c \
XpNotifyPdm.c XpPage.c XpPageDim.c XpPrinter.c XpPutData.c \
XpScreens.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
LIBDPLIBS=\
Xau ${.CURDIR}/../Xau \

4
x11/lib/Xrandr/Makefile
View File

@ -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>
@ -10,7 +10,7 @@ SRCS= Xrandr.c
INCS= Xrandr.h
INCSDIR=${X11INCDIR}/X11/extensions
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
MAN= Xrandr.3

4
x11/lib/Xrender/Makefile
View File

@ -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>
@ -11,7 +11,7 @@ SRCS= Color.c Composite.c Cursor.c FillRect.c FillRects.c Filter.c \
INCS= Xrender.h
INCSDIR=${X11INCDIR}/X11/extensions
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
CPPFLAGS+= -I${X11SRCDIR.xc}/lib/X11

4
x11/lib/Xt/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2004/08/05 01:28:48 lukem Exp $
# $NetBSD: Makefile,v 1.13 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@ -21,7 +21,7 @@ INCS= Composite.h CompositeP.h ConstrainP.h Constraint.h Core.h \
RectObjP.h Shell.h ShellP.h StringDefs.h Vendor.h VendorP.h
INCSDIR=${X11INCDIR}/X11
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.
CPPFLAGS.Intrinsic.c= -DXFILESEARCHPATHDEFAULT=\"${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S\"

4
x11/lib/Xtst/Makefile
View File

@ -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>
@ -7,7 +7,7 @@ LIB= Xtst
SRCS= XTest.c XRecord.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
LIBDPLIBS=\
Xext ${.CURDIR}/../Xext \

4
x11/lib/Xv/Makefile
View File

@ -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>
@ -7,7 +7,7 @@ LIB= Xv
SRCS= Xv.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
LIBDPLIBS=\
Xext ${.CURDIR}/../Xext \

4
x11/lib/XvMC/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2004/01/05 02:29:30 rtr Exp $
# $NetBSD: Makefile,v 1.4 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@ -7,7 +7,7 @@ LIB= XvMC
SRCS= XvMC.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
.include <bsd.x11.mk>
.include <bsd.lib.mk>

4
x11/lib/Xxf86dga/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/04/28 14:17:57 lukem Exp $
# $NetBSD: Makefile,v 1.6 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@ -29,7 +29,7 @@ MLINKS= XDGA.3 XF86DGA.3 \
XDGA.3 XDGASetViewport.3 \
XDGA.3 XDGASync.3
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS.XF86DGA2.c= -Wno-error # gcc3

4
x11/lib/fontconfig/src/Makefile
View File

@ -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>
@ -14,7 +14,7 @@ LIBDPLIBS=\
MAN= fontconfig.3
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
-I${X11SRCDIR.xc}/extras/expat/lib
CPPFLAGS+= -DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' -DHAVE_EXPAT

4
x11/lib/freetype2/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2004/04/29 05:18:26 lukem Exp $
# $NetBSD: Makefile,v 1.8 2005/01/21 05:15:36 rtr Exp $
.include <bsd.own.mk>
@ -19,7 +19,7 @@ INCS= ft2build.h
INCSDIR=${X11INCDIR}
.PATH: ${FREETYPETOP}/include
CPPFLAGS+= ${X11FLAGS.THREADLIB} -DXFREE86_FT2
CPPFLAGS+= ${X11FLAGS.THREADS} -DXFREE86_FT2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
.if defined(MKTTINTERP) && ${MKTTINTERP} != "no"

4
x11/lib/xlibi18n/Makefile.xlibi18n
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.xlibi18n,v 1.5 2004/08/04 08:37:05 lukem Exp $
# $NetBSD: Makefile.xlibi18n,v 1.6 2005/01/21 05:15:37 rtr Exp $
MKLINKLIB= no
@ -9,7 +9,7 @@ MKLINKLIB= no
SHLIB_MAJOR= 2
SHLIB_MINOR= 0
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= ${X11FLAGS.THREADS}
LIBDPLIBS=X11 ${NETBSDSRCDIR}/x11/lib/X11/dynamic