summaryrefslogtreecommitdiff
path: root/x11/xorg-imake/patches/patch-ae
blob: 3e2ca944340149f74d827269f986090d6f9fa0da (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
$NetBSD: patch-ae,v 1.2 2006/01/18 23:53:06 xtraeme Exp $

--- config/cf/linux.cf.in.orig	2005-12-06 11:06:50.000000000 +0100
+++ config/cf/linux.cf.in	2005-12-06 11:09:08.000000000 +0100
@@ -609,10 +609,10 @@
 #  if defined (i386Architecture) && ((GccMajorVersion >3) \
    || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
 #   ifndef CcCmd
-#    define CcCmd		gcc -m32
+#    define CcCmd		@@PKGSRC_CC@@
 #   endif
 #   ifndef CplusplusCmd
-#    define CplusplusCmd	c++ -m32
+#    define CplusplusCmd	@@PKGSRC_CXX@@
 #   endif
 #  endif
 #  if defined (Ppc64Architecture)
@@ -624,8 +624,8 @@
 #   endif
 #  endif
 #  ifndef CcCmd
-#   define CcCmd		gcc
-#   define CplusplusCmd		c++
+#   define CcCmd		@@PKGSRC_CC@@
+#   define CplusplusCmd		@@PKGSRC_CXX@@
 #  endif
 #  ifndef AsCmd
 #   define AsCmd		CcCmd -c -x assembler
@@ -779,7 +779,6 @@
 #define YaccCmd			bison -y
 #define LexCmd			flex -l
 #define HasFlex			YES
-#define LexLib			-lfl
 #define PreProcessCmd		CcCmd -E
 #define PostIncDir		DefaultGccIncludeDir
 #define LdCombineFlags		-r
@@ -853,7 +852,7 @@
 
 #ifdef i386Architecture
 # ifndef OptimizedCDebugFlags
-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
+#  define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
 # endif
 # define LinuxMachineDefines	-D__i386__
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME