diff options
| author | anholt <anholt@FreeBSD.org> | 2002-11-24 18:25:54 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2002-11-24 18:25:54 +0000 |
| commit | 7fe627fa286fb96eca2027107423536a51066fd3 (patch) | |
| tree | b516c94e9d5e60a35e0f0bbc93120de242479104 /graphics | |
| parent | 8c611a9cf556139186e60b27298f37bcfa231c41 (diff) | |
| download | FreeBSD-ports-7fe627fa286fb96eca2027107423536a51066fd3.zip FreeBSD-ports-7fe627fa286fb96eca2027107423536a51066fd3.tar.gz | |
Fix build on recent -current by disabling libXThrStub.
PR: 45658
Submitted by: Stefan Farfeleder <e0026813@stud3.tuwien.ac.at>
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/dri-devel/files/patch-FreeBSD.cf | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/graphics/dri-devel/files/patch-FreeBSD.cf b/graphics/dri-devel/files/patch-FreeBSD.cf index 894c432..878c561 100644 --- a/graphics/dri-devel/files/patch-FreeBSD.cf +++ b/graphics/dri-devel/files/patch-FreeBSD.cf @@ -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 |
