1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
$NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $
--- config/cf/NetBSD.cf.in.orig 2003-07-21 09:42:40.000000000 +0000
+++ config/cf/NetBSD.cf.in 2003-07-21 09:47:58.000000000 +0000
@@ -89,22 +89,28 @@
#define HasVarRun YES
#define HasVarDb YES
+#define HasShadowPasswd NO
#define InstallXloadSetGID NO
-/* Defines for using the GNU pth thread library -- experimental */
+#ifndef NetBSDThreads
+# define NetBSDThreads YES
+#endif
-#ifdef NetBSDPth
-#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */
-#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */
-#define HasThreadSafeAPI NO
-#define HasPosixThreads YES
-#define SystemMTDefines -D_REENTRANT PthreadHLocation
-#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread
-#define SharedX11Reqs ThreadsLibraries
+#if NetBSDThreads && \
+ ((OSMajorVersion > 1) || \
+ (OSMajorVersion == 1 && OSMinorVersion > 6) || \
+ (OSMajorVersion == 1 && OSMinorVersion == 6 && OSTeenyVersion >= 13))
+
+# define HasPosixThreads YES
+# define ThreadedX YES
+# define HasThreadSafeAPI YES
+# define ThreadsLibraries -lpthread
+# define LibraryMTDefines -DUSE_NBSD_THREADLIB
+# define SystemMTDefines -D_REENTRANT
+# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
#else
-#define HasPosixThreads NO
-#define ThreadedX NO
+# define ThreadedX NO
#endif
/*
@@ -122,8 +128,7 @@
#define MkdirHierCmd mkdir -p
-#undef CcCmd
-#define CcCmd gcc
+#define CcCmd @@PKGSRC_CC@@
#ifndef DefaultCCOptions
#if defined(UseInstalled)
#define DefaultCCOptions /**/
@@ -143,7 +148,7 @@
#define UseGccMakeDepend YES
#endif
-#define CppCmd cpp
+#define CppCmd @@PKGSRC_CPP@@
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
#define PreProcessCmd CcCmd -E
@@ -191,10 +196,10 @@
# ifndef DefaultGcc2i386Opt
# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2)
/* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
-# define DefaultGcc2i386Opt -O2
+# define DefaultGcc2i386OpT
# endif
# endif
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
# if OSMajorVersion < 1
# define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF
# else
@@ -204,7 +209,7 @@
# define ServerExtraSysLibs -li386
# endif
#else
-# define OptimizedCDebugFlags -O2
+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
# if defined(SparcArchitecture)
# define ServerOSDefines -DDDXOSINIT
# elif defined(AlphaArchitecture)
|
