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

configure.ac: Drop bashism

Browse source 
- ${var/pattern/replacement} and here-string are bashism.

- here string (<<<<) is bashism too, depsited it's intended for Windows
  build only (which uses Bash inside msys), however the code block is
  still parsed on other platforms (without bash a /bin/sh) before
  evaluated. Let's remove that too.

Change-Id: I3ba59d97b9e9a6b29496b3401c29c4fbf99f46d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170969
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Đoàn Trần Công Danh 2024-07-24 22:06:12 +07:00 committed by Christian Lohmaier
parent 0a6029ba42
commit 92f9529719
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -4731,7 +4731,7 @@ if test "$CCACHE" != ""; then
[use_ccache=yes], [use_ccache=no]) [use_ccache=yes], [use_ccache=no])
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
ac_c_werror_flag=$save_ac_c_werror_flag ac_c_werror_flag=$save_ac_c_werror_flag
if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then if test $use_ccache = yes -a "${CCACHE##*sccache*}" != ""; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
CC="$CCACHE $CC" CC="$CCACHE $CC"
@ -7095,9 +7095,8 @@ if test "$_os" = "WINNT"; then
WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir
# The variable also contains the Windows SDK version # The variable also contains the Windows SDK version
echo $WINDOWS_SDK_LIB_SUBDIR echo $WINDOWS_SDK_LIB_SUBDIR
IFS='.' read -r SDK_v1 SDK_v2 SDK_v3 SDK_v4 <<< "$WINDOWS_SDK_LIB_SUBDIR"
# Assuming maximum of 5 digits for each part and ignoring last part # Assuming maximum of 5 digits for each part and ignoring last part
SDK_NORMALIZED_VER=$((SDK_v1 * 10000000000 + SDK_v2 * 100000 + SDK_v3)) SDK_NORMALIZED_VER=$(echo $WINDOWS_SDK_LIB_SUBDIR | awk -F. '{printf("%d%05d%05d\n", $1, $2, $3)}')
# 10.0.20348.0 is the minimum required version # 10.0.20348.0 is the minimum required version
if test "$SDK_NORMALIZED_VER" -lt 100000020348; then if test "$SDK_NORMALIZED_VER" -lt 100000020348; then
AC_MSG_ERROR([You need Windows SDK greater than or equal 10.0.20348.0]) AC_MSG_ERROR([You need Windows SDK greater than or equal 10.0.20348.0])
@ -7407,7 +7406,7 @@ if test "$CCACHE" != ""; then
dnl an empty program will do, we're checking the compiler flags dnl an empty program will do, we're checking the compiler flags
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
[use_ccache=yes], [use_ccache=no]) [use_ccache=yes], [use_ccache=no])
if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then if test $use_ccache = yes -a "${CCACHE##*sccache*}" != ""; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
CXX="$CCACHE $CXX" CXX="$CCACHE $CXX"
@ -13048,7 +13047,7 @@ if test "$CCACHE" != "" -a -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
[use_ccache=yes], [use_ccache=no]) [use_ccache=yes], [use_ccache=no])
CFLAGS=$save_CFLAGS CFLAGS=$save_CFLAGS
CC=$save_CC CC=$save_CC
if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then if test $use_ccache = yes -a "${CCACHE##*sccache*}" != ""; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
LO_CLANG_CC="$CCACHE $LO_CLANG_CC" LO_CLANG_CC="$CCACHE $LO_CLANG_CC"
@ -13065,7 +13064,7 @@ if test "$CCACHE" != "" -a -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
dnl an empty program will do, we're checking the compiler flags dnl an empty program will do, we're checking the compiler flags
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
[use_ccache=yes], [use_ccache=no]) [use_ccache=yes], [use_ccache=no])
if test $use_ccache = yes -a "${CCACHE/*sccache*/}" != ""; then if test $use_ccache = yes -a "${CCACHE##*sccache*}" != ""; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
LO_CLANG_CXX="$CCACHE $LO_CLANG_CXX" LO_CLANG_CXX="$CCACHE $LO_CLANG_CXX"