Apache OpenOffice (AOO) Bugzilla – Issue 18743
NetBSD-i386 entry in set_soenv.in
Last modified: 2004-05-07 14:40:45 UTC
Add NetBSD-i386 to config_office/set_soenv.in. Index: set_soenv.in =================================================================== RCS file: /cvsroot/3rd-party/openoffice/config_office/set_soenv.in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 set_soenv.in --- set_soenv.in 26 Aug 2003 13:47:43 -0000 1.1.1.1 +++ set_soenv.in 27 Aug 2003 13:11:34 -0000 @@ -268,7 +268,37 @@ if ( $platform eq "$Solaris" ) $PROSWITCH = "-DPRODUCT"; } elsif ( $platform eq "$NetBSD" ) -{ print "Setting NetBSD Sparc specific values... "; +{ + if ( $machine_type eq "i386" ) + { + print "Setting NetBSD i386 specific values... "; + $outfile = "NetBSDi386Env.Set"; + $BIG_SVX = "TRUE"; + $COM = "GCC"; + $COMPATH = '@COMPATH@'; + $CPU = "I"; + $CPUNAME = "INTEL"; + $CVER = "C295"; + $DLLSUFFIX = "fi"; + $GUI = "UNX"; + $GUIBASE = "unx"; + $GUIENV = "sal"; + $GVER = "VCL"; + $OUTPATH = "unxnbsd"; + $INPATH = $OUTPATH.$PROEXT; + $GVERDIR = $INPATH; + $OS = "NETBSD"; + $PATH_SEPERATOR = $ps; + $PROSWITCH = "-DPRODUCT"; + $XPVERSION = "3"; + $XPVERSION = "3"; + $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 (( $machine_type eq "sparc") or ( $machine_type eq "sparc64" )) + { + print "Setting NetBSD Sparc specific values... "; $outfile = "NetBSDSparcEnv.Set"; $BIG_SVX = "TRUE"; $COM = "GCC"; @@ -281,7 +311,7 @@ elsif ( $platform eq "$NetBSD" ) $GUIBASE = "unx"; $GUIENV = "sal"; $GVER = "VCL"; - $OUTPATH = "unxbsds"; + $OUTPATH = "unxnbsd"; $INPATH = $OUTPATH.$PROEXT; $GVERDIR = $INPATH; $OS = "NETBSD"; @@ -292,6 +322,7 @@ elsif ( $platform eq "$NetBSD" ) $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc"; $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads"; + } } elsif ( $platform eq "$FreeBSD" ) { print "Setting FreeBSD specific values... ";
You need to revert this line in the sparc area. Then once we have a working tree you can apply it. - $OUTPATH = "unxbsds"; + $OUTPATH = "unxnbsd";
.
Does it affect more than build working dirs? I didn't think it would. Do you want me to re-supply w/o that change, or are you happy to manually tweak the patch I already submitted?
Waiting on working branch for patch.
Ok, new patch with unxbsd as you requested. Also, i386 and sparc NetBSD-current default to gcc 3 now so that change was also made. Since it's unlikely OO will build on these platforms before NetBSD 2.0 the changes may as well be made now. Index: config_office/set_soenv.in =================================================================== RCS file: /cvs/tools/config_office/set_soenv.in,v retrieving revision 1.10.6.2 diff -u -p -r1.10.6.2 set_soenv.in --- config_office/set_soenv.in 18 Aug 2003 14:36:16 -0000 1.10.6.2 +++ config_office/set_soenv.in 1 Oct 2003 12:48:41 -0000 @@ -268,30 +268,61 @@ if ( $platform eq "$Solaris" ) $PROSWITCH = "-DPRODUCT"; } elsif ( $platform eq "$NetBSD" ) -{ print "Setting NetBSD Sparc specific values... "; - $outfile = "NetBSDSparcEnv.Set"; - $BIG_SVX = "TRUE"; - $COM = "GCC"; - $COMPATH = '@COMPATH@'; - $CPU = "S"; - $CPUNAME = "SPARC"; - $CVER = "C295"; - $DLLSUFFIX = "bs"; - $GUI = "UNX"; - $GUIBASE = "unx"; - $GUIENV = "sal"; - $GVER = "VCL"; - $OUTPATH = "unxbsds"; - $INPATH = $OUTPATH.$PROEXT; - $GVERDIR = $INPATH; - $OS = "NETBSD"; - $PATH_SEPERATOR = $ps; - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; - $XPVERSION = "3"; - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads"; +{ + if ($machine_type eq "sparc") + { + print "Setting NetBSD Sparc specific values... "; + $outfile = "NetBSDSparcEnv.Set"; + $BIG_SVX = "TRUE"; + $COM = "GCC"; + $COMPATH = '@COMPATH@'; + $CPU = "S"; + $CPUNAME = "SPARC"; + $CVER = "C300"; + $DLLSUFFIX = "bs"; + $GUI = "UNX"; + $GUIBASE = "unx"; + $GUIENV = "sal"; + $GVER = "VCL"; + $OUTPATH = "unxbsds"; + $INPATH = $OUTPATH.$PROEXT; + $GVERDIR = $INPATH; + $OS = "NETBSD"; + $PATH_SEPERATOR = $ps; + $PROSWITCH = "-DPRODUCT"; + $XPVERSION = "3"; + $XPVERSION = "3"; + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads"; + } + elsif ($machine_type eq "i386") + { + print "Setting NetBSD i386 specific values... "; + $outfile = "NetBSDi386Env.Set"; + $BIG_SVX = "TRUE"; + $COM = "GCC"; + $COMPATH = '@COMPATH@'; + $CPU = "I"; + $CPUNAME = "INTEL"; + $CVER = "C300"; + $DLLSUFFIX = "fi"; + $GUI = "UNX"; + $GUIBASE = "unx"; + $GUIENV = "sal"; + $GVER = "VCL"; + $OUTPATH = "unxbsds"; + $INPATH = $OUTPATH.$PROEXT; + $GVERDIR = $INPATH; + $OS = "NETBSD"; + $PATH_SEPERATOR = $ps; + $PROSWITCH = "-DPRODUCT"; + $XPVERSION = "3"; + $OSVERSION = '@OSVERSION@'; + $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 eq "$FreeBSD" ) { print "Setting FreeBSD specific values... ";
After a few tests I became more optimistic that might be possible to get it working even under NetBSD 1.6, so I'd like to suggest a slightly different version, which keeps this possibility open. This also has an additional powerpc section.
Created attachment 10282 [details] patch
Created attachment 12971 [details] another patch
There's another patch I need for NetBSD (to be applied after the previous I submitted).
committed to 111fix3
Closing