diff options
| author | dawes <dawes> | 2008-12-27 04:06:45 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2008-12-27 04:06:45 +0000 |
| commit | 7ceceb0949468b69f637ea6992fb04c00b8706d2 (patch) | |
| tree | 24aeda95526ccaeeab710fbe845c97f0a0b633be | |
| parent | 71db3c1d9c937a61b6c4cdf95a76bf474b54454f (diff) | |
Enable HasLibPthread for FreeBSD 7 and later, because libc_r has been dropped,
and was deprecated since some earlier release (6.x?).
| -rw-r--r-- | config/cf/FreeBSD.cf | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/config/cf/FreeBSD.cf b/config/cf/FreeBSD.cf index 70ac556c6..046b0df53 100644 --- a/config/cf/FreeBSD.cf +++ b/config/cf/FreeBSD.cf @@ -1,7 +1,7 @@ -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.160tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.161 2007/01/04 03:33:41 tsi Exp $ /* - * Copyright (c) 1994-2005 by The XFree86 Project, Inc. + * Copyright (c) 1994-2008 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -145,11 +145,19 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe /* * Multi-thread safe libs */ -/* 2.2.7 and later has libc_r (POSIX threads) */ +/* + * 2.2.7 and later has libc_r (POSIX threads) + * 7.0 no longer has libc_r, and it was deprecated prior to that. Use + * libthr or libpthread instead. We'll use libpthread. + */ #if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \ OSMajorVersion >= 3 # ifndef HasLibPthread -# define HasLibPthread NO +# if OSMajorVersion >= 7 +# define HasLibPthread YES +# else +# define HasLibPthread NO +# endif # endif # define HasPosixThreads YES # define ThreadedX YES @@ -161,6 +169,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI # if HasLibPthread # define ThreadsLibraries -lpthread +# define NeedThreadStubLibrary YES # else # define NeedThreadStubLibrary YES # if OSRelVersion >= 500043 |