sal/osl/unx/system.c | 4 ++-- set_soenv.in | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 12f9d1032b02b7e2b87c2f35fa84554df8101eca Author: François Tigeot <[email protected]> Date: Wed Jan 25 19:43:17 2012 +0100 NetBSD also needs the internal gethostbyname_r() implementation Reported by: Thomas Klausner <[email protected]> (cherry picked from commit 5f32a5558e8672ed56d5d393228aefacc632846c) Conflicts: sal/osl/unx/system.c Signed-off-by: Stephan Bergmann <[email protected]> diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c index bf8607d..ba782f6 100644 --- a/sal/osl/unx/system.c +++ b/sal/osl/unx/system.c @@ -33,7 +33,7 @@ static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER; /* struct passwd differs on some platforms */ -#if defined(MACOSX) || defined(IOS) +#if defined(MACOSX) || defined(IOS) || defined(NETBSD) extern int h_errno; @@ -124,7 +124,7 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result, return res; } -#endif // OSX || IOS +#endif // OSX || IOS || NETBSD #if defined(MACOSX) /* commit c2c9eb11b8a095833074611c3e40279ee4ff21f7 Author: François Tigeot <[email protected]> Date: Wed Jan 25 18:50:35 2012 +0100 Ensure Env.Host.sh always return a zero exit code * On some NetBSD systems, the last unset command returns a non-zero exit code * This made the make(1) processes terminate immediately in source-env-and-recurse, breaking the build. Reported by: Thomas Klausner <[email protected]> (cherry picked from commit a79889083b25d69ae6b801ed8cee90b5dd9199c4) Signed-off-by: Stephan Bergmann <[email protected]> diff --git a/set_soenv.in b/set_soenv.in index afaac53..817693e 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -2063,6 +2063,9 @@ ToFile( "ENV_SCRIPT", "$outfile", "e" ); # print OUT "export $exportvars$newline"; print OUT "unset $unsetvars$newline"; +# unset may return a non-zero value and make the initial +# make(1) processes terminate with an error +print OUT "true $newline"; # #---------------------------
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
