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
|
$NetBSD: patch-af,v 1.6 2013/08/15 08:15:04 jperkin Exp $
Run-time path fix for Solaris for the X client libraries. Without this
patch, libraries such as libXext.so will not contain a run-time link path
to /usr/pkg/xorg/lib, causing run time link failures or possibly linking
with other (non-Pkgsrc) X libraries on the system!
Disable Solaris64bitSubdir, at least until multi-arch is supported.
Use pkgsrc CC, CXX, CFLAGS and INSTALL.
--- sun.cf.orig 2013-07-23 05:23:14.000000000 +0000
+++ sun.cf
@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
# endif
# endif
# if OSMinorVersion > 10
-# define InstallCmd /usr/gnu/bin/install
+# define InstallCmd @@INSTALL@@
# elif OSMinorVersion > 3
-# define InstallCmd /usr/ucb/install
+# define InstallCmd @@INSTALL@@
# endif
#ifndef LargefileDefines
# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
# endif
# if HasGcc2
# ifndef CcCmd
-# define CcCmd gcc
+# define CcCmd @@PKGSRC_CC@@
+# endif
+# ifndef CppCmd
+# define CppCmd @@PKGSRC_CPP@@
+# endif
+# ifndef CplusplusCmd
+# define CplusplusCmd @@PKGSRC_CXX@@
# endif
# ifndef AsCmd
# define AsCmd CcCmd -c -x assembler
# endif
# ifndef OptimizedCDebugFlags
-# ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-# elif defined(AMD64Architecture)
-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt
-# else
-# define OptimizedCDebugFlags -O2
-# endif
+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
# endif
# if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd)
# if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
/* This is to work around what appears to be a PIC bug in some gcc/egcs
versions that shows up with the Solaris 7/x86 <ctype.h>. */
# define SharedLibraryLdCmd $(LD)
-# define SharedLibraryLoadFlags -G -z textwarn
+# define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags
# else
# define SharedLibraryLdCmd $(CC)
-# define SharedLibraryLoadFlags -shared -z text
+# define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags
# endif
# endif
# else
@@ -853,7 +853,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma
# endif
#endif
-#ifdef Solaris64bitSubdir
+#ifdef NotYetSolaris64bitSubdir
# define LibDirName Concat3(lib,/,Solaris64bitSubdir)
#endif
|
