Stephan Bergmann
811769f009
...as emsdk 5.0.3 deprecated the predefined EMSCRIPTEN macro (see <https://github.com/emscripten-core/emscripten/commit/506052bd8b4e23ded7f2351c62ca3b24d40c8cf3> "Warn about usage of deprecated EMSCRIPTEN macro. NFC (#26381)"), causing failures like > In file included from static/source/unoembindhelpers/PrimaryBindings.cxx:29: > In file included from include/sfx2/viewsh.hxx:35: > In file included from include/editeng/outliner.hxx:32: > In file included from include/tools/color.hxx:26: > include/osl/endian.h:66:15: error: macro 'EMSCRIPTEN' has been marked as deprecated: use __EMSCRIPTEN__ instead [-Werror,-Wdeprecated-pragma] > 66 | #elif defined EMSCRIPTEN > | ^ > /home/sberg/emsdk/5.0.4/emsdk/emscripten/main/cache/sysroot/include/emscripten/emscripten.h:35:66: note: macro marked 'deprecated' here > 35 | #pragma clang deprecated(EMSCRIPTEN, "use __EMSCRIPTEN__ instead") > | ^ To avoid confusion, also suppress the -D$(OS) in solenv/gbuild/platform/unxgcc.mk that would unnecessarily keep defining EMSCRIPTEN. Change-Id: Ic1f187cf1c6417cd95d4092e9cea01a665bd1b2f Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/34 Reviewed-by: Michael Stahl <michael.stahl@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit 50291c2ed83bdb49bb827a4a12905d94b8c42035) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205167 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
89 lines
2.5 KiB
C++
89 lines
2.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <config_folders.h>
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#if defined UNX
|
|
#include <sys/resource.h>
|
|
#endif
|
|
|
|
#include <osl/process.h>
|
|
#include <rtl/bootstrap.hxx>
|
|
#include <rtl/ustrbuf.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
#include <sal/types.h>
|
|
#include <tools/extendapplicationenvironment.hxx>
|
|
|
|
namespace tools
|
|
{
|
|
void extendApplicationEnvironment()
|
|
{
|
|
#if defined UNX && !defined __EMSCRIPTEN__
|
|
// Try to set RLIMIT_NOFILE as large as possible (failure is harmless):
|
|
rlimit lim;
|
|
if (getrlimit(RLIMIT_NOFILE, &lim) == 0)
|
|
{
|
|
lim.rlim_cur = lim.rlim_max;
|
|
setrlimit(RLIMIT_NOFILE, &lim);
|
|
}
|
|
#endif
|
|
|
|
// Make sure URE_BOOTSTRAP environment variable is set (failure is fatal):
|
|
OUStringBuffer env(512);
|
|
OUString envVar(u"URE_BOOTSTRAP"_ustr);
|
|
OUString uri;
|
|
if (rtl::Bootstrap::get(envVar, uri))
|
|
{
|
|
if (!uri.matchIgnoreAsciiCase("vnd.sun.star.pathname:"))
|
|
{
|
|
uri = rtl::Bootstrap::encode(uri);
|
|
}
|
|
env.append(uri);
|
|
}
|
|
else
|
|
{
|
|
if (osl_getExecutableFile(&uri.pData) != osl_Process_E_None)
|
|
{
|
|
abort();
|
|
}
|
|
sal_Int32 lastDirSeparatorPos = uri.lastIndexOf('/');
|
|
if (lastDirSeparatorPos >= 0)
|
|
{
|
|
uri = uri.copy(0, lastDirSeparatorPos + 1);
|
|
}
|
|
env.append(rtl::Bootstrap::encode(uri));
|
|
#ifdef MACOSX
|
|
env.append("../" LIBO_SHARE_FOLDER "/");
|
|
#endif
|
|
env.append(SAL_CONFIGFILE("fundamental"));
|
|
}
|
|
OUString envValue(env.makeStringAndClear());
|
|
if (osl_setEnvironment(envVar.pData, envValue.pData) != osl_Process_E_None)
|
|
{
|
|
abort();
|
|
}
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|