ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Adapt to change in emsdk 5.0.1 version.h

Browse Source 
(<https://github.com/emscripten-core/emscripten/commit/4cce5e9a4a245713df7fc5bf4ad1e6d7463cbf4b>
"Use uppercase for version macros (#26180)"Adapt to change in emsdk 5.0.1
version.h

(<https://github.com/emscripten-core/emscripten/commit/4cce5e9a4a245713df7fc5bf4ad1e6d7463cbf4b>
"Use uppercase for version macros (#26180)")

Change-Id: I4cdf2447213ae82763f1cb1a19e84600c6267908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199995
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
This commit is contained in:
Stephan Bergmann
2026-02-22 22:57:31 +01:00
parent 765b62d331
commit 7bac6ec0a2
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+9 -3
View File
@@ -1521,9 +1521,15 @@ if test "$_os" = "Emscripten"; then
fi
fi
if test -f "$EMSCRIPTEN_VERSION_H"; then
EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p')
EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_minor__ //p')
EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_tiny__ //p')
if $GREP -q __EMSCRIPTEN_MAJOR__ "$EMSCRIPTEN_VERSION_H"; then
EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_MAJOR__ "$EMSCRIPTEN_VERSION_H" | head -n 1 | $SED -ne 's/.*__EMSCRIPTEN_MAJOR__ //p')
EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_MINOR__ "$EMSCRIPTEN_VERSION_H" | head -n 1 | $SED -ne 's/.*__EMSCRIPTEN_MINOR__ //p')
EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_TINY__ "$EMSCRIPTEN_VERSION_H" | head -n 1 | $SED -ne 's/.*__EMSCRIPTEN_TINY__ //p')
else
EMSCRIPTEN_MAJOR=$($GREP __EMSCRIPTEN_major__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p')
EMSCRIPTEN_MINOR=$($GREP __EMSCRIPTEN_minor__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_minor__ //p')
EMSCRIPTEN_TINY=$($GREP __EMSCRIPTEN_tiny__ "$EMSCRIPTEN_VERSION_H" | $SED -ne 's/.*__EMSCRIPTEN_tiny__ //p')
fi
else
EMSCRIPTEN_DEFINES=$(echo | emcc -dM -E - | $GREP __EMSCRIPTEN_)
EMSCRIPTEN_MAJOR=$(echo "$EMSCRIPTEN_DEFINES" | $SED -ne 's/.*__EMSCRIPTEN_major__ //p')
vcl/unx/generic/app/geninst.cxx
+6
View File
@@ -91,9 +91,15 @@ OUString SalGenericInstance::getOSVersion()
}
aKernelVer = OUString::createFromAscii(stName.sysname) + " " + aKernelVer.copy(0, nIndex);
#elif defined(EMSCRIPTEN)
#if defined __EMSCRIPTEN_MAJOR__
aKernelVer = u"Emscripten "_ustr + OUString::number(__EMSCRIPTEN_MAJOR__) + u"."_ustr
+ OUString::number(__EMSCRIPTEN_MINOR__) + u"."_ustr
+ OUString::number(__EMSCRIPTEN_TINY__);
#else
aKernelVer = u"Emscripten "_ustr + OUString::number(__EMSCRIPTEN_major__) + u"."_ustr
+ OUString::number(__EMSCRIPTEN_minor__) + u"."_ustr
+ OUString::number(__EMSCRIPTEN_tiny__);
#endif
#endif
return aKernelVer;
}