1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Fix build on recent -current by disabling libXThrStub.

PR:		45658
Submitted by:	Stefan Farfeleder <e0026813@stud3.tuwien.ac.at>
This commit is contained in:
Eric Anholt 2002-11-24 18:25:54 +00:00
parent 43a4fd2693
commit 1c2df5ed62
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=71019

View File

@ -1,11 +1,29 @@
Index: config/cf/FreeBSD.cf
===================================================================
RCS file: /cvsroot/dri/xc/xc/config/cf/FreeBSD.cf,v
retrieving revision 1.15.24.1
diff -u -r1.15.24.1 FreeBSD.cf
--- config/cf/FreeBSD.cf 15 Jul 2002 20:20:54 -0000 1.15.24.1
+++ config/cf/FreeBSD.cf 23 Aug 2002 22:44:33 -0000
@@ -144,6 +144,7 @@
--- config/cf/FreeBSD.cf.orig Mon Aug 26 19:58:16 2002
+++ config/cf/FreeBSD.cf Sun Nov 24 10:25:09 2002
@@ -89,10 +89,18 @@
# if HasLibPthread
# define ThreadsLibraries -lpthread
# else
-# define BuildThreadStubLibrary YES
-# define NeedUIThrStubs YES
-# define ThreadsCompileFlags -pthread
-# define ThreadsLibraries -pthread
+# if OSRelVersion >= 500043
+# define BuildThreadStubLibrary YES
+# define NeedUIThrStubs YES
+# else
+# define BuildThreadStubLibrary YES
+# define NeedUIThrStubs YES
+# endif
+# if (OSRelVersion >= 500016)
+# define ThreadsLibraries -lc_r
+# else
+# define ThreadsLibraries -pthread
+# endif
# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
# endif
@@ -144,6 +152,7 @@
*
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
@ -13,7 +31,7 @@ diff -u -r1.15.24.1 FreeBSD.cf
#if BuildThreadStubLibrary && !UseInstalled
# define CcCmd $(CLIENTENVSETUP) cc
# define CplusplusCmd $(CLIENTENVSETUP) c++
@@ -151,6 +152,9 @@
@@ -151,6 +160,9 @@
# define CcCmd cc
# define CplusplusCmd c++
#endif