blob: 2a50ba5c0bf379ac3700acdbcfad60770a6a5b50 (
plain)
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
|
$NetBSD: patch-ac,v 1.2 2004/01/31 14:38:15 xtraeme Exp $
--- config/cf/FreeBSD.cf.in.orig Sat Jan 31 15:05:04 2004
+++ config/cf/FreeBSD.cf.in Sat Jan 31 15:07:28 2004
@@ -161,15 +161,10 @@
*
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
-#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
-# define CcCmd $(CLIENTENVSETUP) cc
-# define CplusplusCmd $(CLIENTENVSETUP) c++
-#else
-# define CcCmd cc
-# define CplusplusCmd c++
-#endif
+#define CcCmd @@PKGSRC_CC@@
+#define CplusplusCmd @@PKGSRC_CXX@@
-#define CppCmd /usr/bin/cpp
+#define CppCmd @@PKGSRC_CPP@@
#define PreProcessCmd CppCmd
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
@@ -177,7 +172,7 @@
#if defined(UseInstalled)
#define DefaultCCOptions /**/
#else
-#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions
+#define DefaultCCOptions -ansi -Dasm=__asm
#endif
#endif
#ifndef ExtraLibraries
@@ -482,18 +477,9 @@
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#endif
-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
-#ifndef DefaultGcc2i386Opt
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O2
-#endif
-#endif
-#ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-#else
-# define OptimizedCDebugFlags -O
-#endif
+#define DefaultGcc2i386Opt
+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
#ifndef PreIncDir
# define PreIncDir /usr/include
@@ -519,7 +505,7 @@
* Compress manual pages
*/
#ifndef CompressManPages
-# define CompressManPages YES
+# define CompressManPages NO
#endif
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
|
