Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove pthread patches for Xorg

Browse Source
This commit is contained in:
Lionel Sambuc
2017-11-26 11:31:22 +00:00
parent 09f6dfc808
commit 7b560afcf0
21 changed files with 20 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
external/mit/xorg/bin/glxgears/Makefile vendored
View File

@@ -8,9 +8,8 @@ PROG= glxgears
CPPFLAGS+=${X11FLAGS.THREADS}
#LSC: NO pthread on minix!
LDADD+= -lGL -lXext -lX11 -lm
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBM}
LDADD+= -lGL -lXext -lX11 -lpthread -lm
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
.PATH: ${X11SRCDIR.mesa-demos}/src/xdemos

5
external/mit/xorg/bin/glxinfo/Makefile vendored
View File

@@ -14,9 +14,8 @@ SRCS+= glinfo_common.c glxinfo.c
CPPFLAGS+=${X11FLAGS.THREADS} -DDO_GLU
#__MINIX: No pthread
LDADD+= -lGL -lXext -lX11 -lm
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBM}
LDADD+= -lGL -lXext -lX11 -lpthread -lm
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
.PATH: ${X11SRCDIR.mesa-demos}/src/xdemos

8
external/mit/xorg/bin/ico/Makefile vendored
View File

@@ -4,12 +4,10 @@
PROG= ico
#__MINIX: No Pthreads: -DMULTITHREAD
CPPFLAGS+= ${X11FLAGS.THREADS} ${X11FLAGS.EXTENSION}
CPPFLAGS+=-DMULTITHREAD ${X11FLAGS.THREADS} ${X11FLAGS.EXTENSION}
#__MINIX: No pthreads
LDADD+= -lXext -lX11 -lm
DPADD+= ${LIBXEXT} ${LIBX11} ${LIBM}
LDADD+= -lXext -lX11 -lpthread -lm
DPADD+= ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man

2
external/mit/xorg/bin/xdm/Makefile vendored
View File

@@ -42,7 +42,7 @@ LDADD+= -lpam ${PAM_STATIC_LDADD}
DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.endif
SUBDIR+= config
SUBDIR+= chooser config
TARGETS+= configinstall
.include "Makefile.xdm"

5
external/mit/xorg/bin/xdriinfo/Makefile vendored
View File

@@ -6,9 +6,8 @@ PROG= xdriinfo
SRCS= xdriinfo.c
#LSC: No pthreads on MINIX!
LDADD+= -lGL -lXext -lX11
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11}
LDADD+= -lGL -lXext -lX11 -lpthread
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man

5
external/mit/xorg/bin/xlsatoms/Makefile vendored
View File

@@ -7,11 +7,6 @@ PROG= xlsatoms
LDADD+= -lxcb
DPADD+= ${LIBXCB}
.if defined(__MINIX)
LDADD+= -lmthread
DPADD+= ${LIBMTHREAD}
.endif # defined(__MINIX)
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man

5
external/mit/xorg/bin/xlsclients/Makefile vendored
View File

@@ -12,11 +12,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
LDADD+= -lxcb -lxcb-atom
DPADD+= ${LIBXCB} ${LIBXCB_ATOM}
.if defined(__MINIX)
LDADD+= -lmthread
DPADD+= ${LIBMTHREAD}
.endif # defined(__MINIX)
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
.include <bsd.x11.mk>

5
external/mit/xorg/bin/xterm/Makefile vendored
View File

@@ -36,11 +36,6 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA}
LDADD+= -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
DPADD+= ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
.if defined(__MINIX)
LDADD+= -lmthread
DPADD+= ${LIBMTHREAD}
.endif # defined(__MINIX)
SUBDIR= resize uxterm
.PATH: ${X11SRCDIR.${PROG}}

3
external/mit/xorg/lib/Makefile vendored
View File

@@ -16,8 +16,7 @@ SUBDIR+=xkeyboard-config
SUBDIR+=libxcb \
.WAIT
.if !defined(MLIBDIR)
#__MINIX: gallium
SUBDIR+=dri7 dri
SUBDIR+=dri7 dri gallium
.endif
SUBDIR+=fontconfig libSM libX11 \
.WAIT \

3
external/mit/xorg/lib/dri/Makefile vendored
View File

@@ -25,9 +25,6 @@ CPPFLAGS+= \
#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
.if defined(__MINIX)
CPPFLAGS+= -DHAVE_PTHREAD=1
LDADD+= -lmthread
DPADD+= ${LIBMTHREAD}
CWARNFLAGS.clang+= -Wno-\#warnings
#LSC: For clang 3.4
CWARNFLAGS.clang+= -Wno-attributes

6
external/mit/xorg/lib/dri7/dri.mk vendored
View File

@@ -16,15 +16,9 @@ CPPFLAGS+= \
-I${X11SRCDIR.MesaLib7}/src/mesa \
-I${DESTDIR}${X11INCDIR}/libdrm
.if !defined(__MINIX)
CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
-DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
-DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
.else
CPPFLAGS+= -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
-DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
-DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
.endif # !defined(__MINIX)
CPPFLAGS+= -Wno-stack-protector

6
external/mit/xorg/lib/dri7/libmesa/Makefile vendored
View File

@@ -17,17 +17,11 @@ CPPFLAGS+= \
-I${X11SRCDIR.MesaLib7}/src/mesa \
-I${X11SRCDIR.MesaLib7}/src/mapi
.if !defined(__MINIX)
CPPFLAGS+= ${X11FLAGS.THREADLIB} \
-DPTHREADS -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
-DHAVE_ALIAS -DIN_DRI_DRIVER
#CPPFLAGS+= -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_POSIX_MEMALIGN
CFLAGS+= -pthread
.else
CPPFLAGS+= ${X11FLAGS.THREADLIB} \
-D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
-DHAVE_ALIAS -DIN_DRI_DRIVER
.endif # !defined(__MINIX)
.include "../libmesa7.mk"
.include "../libglsl7.mk"

7
external/mit/xorg/lib/libGL/Makefile vendored
View File

@@ -145,13 +145,10 @@ CPPFLAGS+= \
-DYYTEXT_POINTER=1
CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
.if !defined(__MINIX)
CFLAGS+= -pthread
.else
LDADD+= -lmthread
DPADD+= ${LIBMTHREAD}
.if defined(__MINIX)
CWARNFLAGS.clang+= -Wno-\#warnings
.endif # !defined(__MINIX)
.endif # defined(__MINIX)
LIBDPLIBS= Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic \

8
external/mit/xorg/lib/libGLU/Makefile vendored
View File

@@ -114,11 +114,7 @@ SRCS.nurbtess= \
searchTree.cc
.PATH: ${GLUDIR}/libnurbs/nurbtess
.if !defined(__MINIX)
CPPFLAGS+= -DPTHREADS -DUSE_XSHM -DHZ=100 -DNDEBUG -DLIBRARYBUILD
.else
CPPFLAGS+= -DUSE_XSHM -DHZ=100 -DNDEBUG -DLIBRARYBUILD
.endif # !defined(__MINIX)
CPPFLAGS+= -I${GLUDIR}/include \
-I${GLUDIR}/libnurbs/internals \
-I${GLUDIR}/libnurbs/interface \
@@ -127,11 +123,7 @@ CPPFLAGS+= -I${GLUDIR}/include \
SRCS= ${SRCS.libutil} ${SRCS.libtess} \
${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
.if !defined(__MINIX)
CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread
.else
CFLAGS+= -fno-strict-aliasing -fvisibility=hidden
.endif # !defined(__MINIX)
.PATH: ${X11SRCDIR.glu}/include/GL
INCS= glu.h glu_mangle.h

4
external/mit/xorg/lib/libX11/Makefile vendored
View File

@@ -96,13 +96,9 @@ FILESDIR= ${X11LIBDIR}
XlibConf.h: XlibConf.h.in
${_MKTARGET_CREATE}
.if !defined(__MINIX)
${TOOL_SED} -e 's/#undef XTHREADS/#define XTHREADS 1/' \
-e 's/#undef XUSE_MTSAFE_API/#define XUSE_MTSAFE_API 1/' \
< ${.ALLSRC} > ${.TARGET}
.else
${TOOL_CAT} ${.ALLSRC} > ${.TARGET}
.endif # !defined(__MINIX)
CLEANFILES+= XlibConf.h

6
external/mit/xorg/lib/libglapi/Makefile vendored
View File

@@ -51,13 +51,7 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB}
.include "${.CURDIR}/../libGL/mesa-ver.mk"
.if !defined(__MINIX)
CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread -fno-builtin-memcmp
.else
CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -fno-builtin-memcmp
LDADD+= -lmthread
DPADD+= ${LIBMTHREAD}
.endif # !defined(__MINIX)
CPPFLAGS+= \
-DPACKAGE_NAME=\"Mesa\" \

3
external/mit/xorg/lib/libmesa.mk vendored
View File

@@ -423,14 +423,13 @@ CPPFLAGS+= \
-DPACKAGE=\"mesa\" \
-DVERSION=\"10.3.5\"
#__MINIX: No Pthreads: -DHAVE_PTHREAD=1
CPPFLAGS+= \
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
-DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE___BUILTIN_BSWAP32=1 \
-DHAVE___BUILTIN_BSWAP64=1 -DHAVE_DLADDR=1 -DHAVE_CLOCK_GETTIME=1 \
-DHAVE_POSIX_MEMALIGN -DHAVE_DLOPEN
-DHAVE_POSIX_MEMALIGN -DHAVE_PTHREAD=1 -DHAVE_DLOPEN
.include "../asm.mk"

4
external/mit/xorg/lib/pixman/Makefile vendored
View File

@@ -109,8 +109,8 @@ CPPFLAGS+= -DHAVE_CONFIG_H \
-I${X11SRCDIR.pixman}/pixman
# With pixman 0.28.3, HAVE_PTHREAD_SETSPECIFIC is much faster than TLS
.if !defined(__MINIX)
CPPFLAGS+= -DHAVE_PTHREAD_SETSPECIFIC
.if defined(__MINIX)
#CPPFLAGS+= -DHAVE_PTHREAD_SETSPECIFIC
#CPPFLAGS+= -DTLS=__thread
.else
# LSC: No thread support on minix

3
external/mit/xorg/lib/xcb-util/Makefile vendored
View File

@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2012/01/07 02:07:58 mrg Exp $
#__MINIX: reply, render-util requires pthreads
SUBDIR= keysyms \
SUBDIR= reply keysyms render-util \
atom event aux .WAIT property .WAIT \
image icccm

5
external/mit/xorg/server/drivers/xf86-video-intel/Makefile vendored
View File

@@ -25,7 +25,6 @@ SRCS+= i810_video.c
SRCS+= i810_wmark.c
SRCS+= i810_xaa.c
.if !defined(__MINIX)
# sna
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna
SRCS+= blt.c
@@ -105,7 +104,6 @@ SRCS+= fbspan.c
SRCS+= fbstipple.c
SRCS+= fbtile.c
SRCS+= fbutil.c
.endif # !defined(__MINIX)
# uxa
.PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
@@ -192,8 +190,7 @@ CPPFLAGS+= -DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\"
CFLAGS+= -fvisibility=hidden
LIBDPLIBS+= drm_intel ${.CURDIR}/../../../lib/libdrm_intel
# MINIX: No pthread
#LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
.include "../Makefile.xf86-driver"

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

@@ -17,8 +17,8 @@ CPPFLAGS+= -DNO_ALLOCA
X11FLAGS.VERSION= -DOSMAJORVERSION=5 -DOSMINORVERSION=99 # XXX
# THREADS_DEFINES
# LSC (MINIX): Not supported: -D_REENTRANT-DXTHREADS -DXUSE_MTSAFE_API
X11FLAGS.THREADS= -DXNO_MTSAFE_PWDAPI
X11FLAGS.THREADS= -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API \
-DXNO_MTSAFE_PWDAPI
# CONNECTION_FLAGS
# LSC (MINIX): Not supported: -DHAS_FCHOWN
@@ -82,10 +82,6 @@ X11FLAGS.SERVER= -DSHAPE -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \
X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \
-DDDXOSVERRORF -DDDXTIME -DUSB_HID
.if defined(__MINIX)
X11FLAGS.OS_DEFINES+= -DXOS_USE_NO_LOCKING
.endif # defined(__MINIX)
.if !(${MACHINE} == "acorn32" || \
${MACHINE} == "amiga" || \
${MACHINE} == "pmax" || \