Module Name: src
Committed By: riastradh
Date: Thu Apr 3 02:40:45 UTC 2014
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
Link Xorg with -lpthread on x86.
This will be needed by the new xf86-video-intel, which uses pthreads
in SNA (SandyBridge New Acceleration). It shouldn't hurt, but is not
needed, on any other architecture.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.5 Wed Oct 3 21:50:14 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Thu Apr 3 02:40:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/03 21:50:14 gsutre Exp $
+# $NetBSD: Makefile,v 1.6 2014/04/03 02:40:45 riastradh Exp $
.include <bsd.own.mk>
@@ -77,6 +77,12 @@ LDADD+= -lalpha
DPADD+= ${LIBALPHA}
.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+# Needed by current xf86-video-intel for SNA.
+LDADD+= -lpthread
+DPADD+= ${LIBPTHREAD}
+.endif
+
LDADD+= -lm
DPADD+= ${DPADD.dix} \
