[Libreoffice-commits] .: configure.in dmake/unix solenv/bin

[Thomas Klausner]

 configure.in         |    2 +-
 dmake/unix/runargv.c |    2 +-
 solenv/bin/mapgen.pl |    3 ++-
 solenv/bin/ooinstall |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 54ef8ecbebc225d9141243256d86b447149d29f8
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Thu Dec 16 22:36:27 2010 +0100

    Handle NetBSD like the other BSDs in more cases.

diff --git a/configure.in b/configure.in
index 394c3b8..2c5297f 100755
--- a/configure.in
+++ b/configure.in
@@ -7828,7 +7828,7 @@ dnl ===================================================================
 dnl Number of CPUs to use during the build
 dnl ===================================================================
 AC_MSG_CHECKING([for number of processors to use])
-if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zOpenBSD"; then
+if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o "z`uname -s`" = "zOpenBSD"; then
     BUILD_NCPUS=`sysctl -n hw.ncpu`
 else
     BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index d74c0d6..03d9a45 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -438,7 +438,7 @@ private_strerror (errnum)
      int errnum; 
 { 
 #ifndef __APPLE__
-# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__)
+# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
   extern  const char * const sys_errlist[];
 # else
   extern  char *sys_errlist[];
diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl
index c3effeb..1a2485a 100644
--- a/solenv/bin/mapgen.pl
+++ b/solenv/bin/mapgen.pl
@@ -135,8 +135,9 @@ sub filter_symbols {
         $env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
         $env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
         $env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
+        $env_section = '1' and next if ((/^# NETBSD #$/) && ($ENV{OS} eq 'NETBSD'));
         $env_section = '1' and next if ((/^# OPENBSD #$/) && ($ENV{OS} eq 'OPENBSD'));
-        last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/) || (/^# OPENBSD #$/)));
+        last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/) || (/^# NETBSD #$/) || (/^# OPENBSD #$/)));
         next if (!$_ || /^#/);
         push(@filters, $_);
     };
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index ade4072..e718b8a 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -14,7 +14,7 @@ use Cwd;
 $path = '';
 $do_link = 0;
 
-( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
+( $^O =~ /netbsd/i ) || ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
 
 # Workaround for system Mozilla
 if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {