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
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
$NetBSD: patch-ak,v 1.8 2008/04/13 20:32:43 hira Exp $
--- config_office/set_soenv.in.orig 2008-01-23 17:07:28.000000000 +0000
+++ config_office/set_soenv.in 2008-04-14 04:39:32.000000000 +0000
@@ -40,7 +40,7 @@
#
my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
$comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
- $wps, $wps2, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
+ $wps, $wps2, $cur_dir, $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW,
$USE_MINGW, $platform, $NOWRAPCMD,
$cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
@@ -90,7 +90,7 @@
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
$PROEXT,
- $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
+ $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -132,6 +132,7 @@
$par_dir = ".."; # parrent directory
$I = " -I"; # include search path
$L = " -L"; # library search path
+$R = " -R"; # library search path
$D = " -D"; # define search path
$empty = ""; # used as argument
$no_stl = "NO_STLPORT4"; # possible argument
@@ -284,6 +285,16 @@
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
+ elsif ($platform =~ m/^x86_64/)
+ { print "Setting NetBSD x86-64 specific values... ";
+ $outfile = "NetBSDX86-64Env.Set";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxbsdx";
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ }
elsif ($platform =~ m/^sparc/)
{ print "Setting NetBSD Sparc specific values... ";
$outfile = "NetBSDSparcEnv.Set";
@@ -310,7 +321,14 @@
}
#Conditional setting depending on gcc3:
$CVER = "C300";
- $OUTPATH = $OUTPATH."2";
+ if (@GCCVER@ >= 30401) {
+ $CVER = "C341";
+ $OUTPATH = $OUTPATH."3";
+ }
+ else {
+ $CVER = "C300";
+ $OUTPATH = $OUTPATH."2";
+ }
# General NetBSD settings:
$BIG_SVX = "TRUE";
$COM = "GCC";
@@ -1387,7 +1405,8 @@
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
$L_STLPORT_LIB.
- $L.$XLIB;
+ $L.$XLIB.
+ $R.$XLIB;
}
elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
{ $SOLARLIB = $L.$par_dir.$LIB.
@@ -1548,6 +1567,7 @@
}
if ($SYSTEM_PYTHON eq "NO") {
+ $PYTHON = python
$PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
$PYTHONHOME = $SOLARVER.$ds.$INPATH;
if ($GUIBASE eq "WIN") {
@@ -1693,6 +1713,7 @@
ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
}
ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" );
+ToFile( "X11_LDFLAGS", "@X_LIBS@", "e" );
ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" );
ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
@@ -1942,6 +1963,7 @@
ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" );
ToFile( "MOZ_NSPR_CFLAGS", "@MOZ_NSPR_CFLAGS@", "e" );
ToFile( "MOZ_NSS_CFLAGS", "@MOZ_NSS_CFLAGS@", "e" );
+ToFile( "MOZ_NSS_LIBS", "@MOZ_NSS_LIBS@", "e" );
ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" );
ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" );
ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
@@ -1967,6 +1989,7 @@
ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
+ToFile( "PYTHON", "@PYTHON@", "e" );
ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );
ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );
if ($SYSTEM_PYTHON eq "NO") {
|
