strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle NetBSD like the other BSDs in more cases.

Browse source
This commit is contained in:
Thomas Klausner 2010-12-16 22:36:27 +01:00
parent ed401d017c
commit 32699c99d7
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -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`

2
dmake/unix/runargv.c
View file

@ -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[];

3
solenv/bin/mapgen.pl
View file

@ -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, $_);
};

2
solenv/bin/ooinstall
View file

@ -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' ) {