diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2010-12-16 22:36:27 +0100 |
|---|---|---|
| committer | Thomas Klausner <wiz@NetBSD.org> | 2010-12-16 22:40:05 +0100 |
| commit | 32699c99d7789ed0bdc31696e0d6dc0bc3d85d80 (patch) | |
| tree | d55f0557f57afc9e34c3a7e3658752dba4ac5a3c | |
| parent | ed401d017cf4d1c67dbd9455f54648bd512be023 (diff) | |
Handle NetBSD like the other BSDs in more cases.
| -rwxr-xr-x | configure.in | 2 | ||||
| -rw-r--r-- | dmake/unix/runargv.c | 2 | ||||
| -rw-r--r-- | solenv/bin/mapgen.pl | 3 | ||||
| -rwxr-xr-x | solenv/bin/ooinstall | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 394c3b80fe96..2c5297f7b586 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 4be342bbb273..95bfc6115456 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 a427da997367..aa61043cebbf 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 ade407278aec..e718b8aabcbb 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' ) { |