1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid bash specific variable substitution

Browse Source 
It may cause parse errors in some other sh even in never executed
parts.
This commit is contained in:
Nobuyoshi Nakada 2022-12-01 13:49:48 +09:00
parent 11871e49c4
commit eb6785356d
Notes: git 2022-12-02 14:46:03 +00:00 
Merged: https://github.com/ruby/ruby/pull/6844
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/check_misc.yml vendored
View File

@ -17,10 +17,13 @@ jobs:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Check if C-sources are US-ASCII - name: Check if C-sources are US-ASCII
run: | run: |
! grep -r -n '[^ -~]' *.[chy] include internal win32/*.[ch] ! grep -r -n '[^ -~]' -- *.[chy] include internal win32/*.[ch]
- name: Check for trailing spaces - name: Check for trailing spaces
run: | run: |
! git grep -n '[ ]$' '*.rb' '*.[chy]' ! git grep -n '[ ]$' -- '*.rb' '*.[chy]'
- name: Check for bash specific substitution in configure.ac
run: |
! git grep -n '\${[A-Za-z_0-9]*/' -- configure.ac
- name: Check for header macros - name: Check for header macros
run: | run: |
! for header in ruby/*.h; do \ ! for header in ruby/*.h; do \

11
configure.ac
View File

@ -133,9 +133,12 @@ AC_CANONICAL_TARGET
AS_CASE(["$target_cpu-$target_os"], AS_CASE(["$target_cpu-$target_os"],
[aarch64-darwin*], [ [aarch64-darwin*], [
target_cpu=arm64 target_cpu=arm64
AS_CASE(["$target_vendor"], [unknown], [target_vendor=apple target=${target/-unknown-/-apple-}]) AS_CASE(["$target_vendor"], [unknown], [
target="${target/aarch64/arm64}" target_vendor=apple
target_alias="${target_alias/aarch64/arm64}" target=${target%%-unknown-*}-apple-${target@%:@*-unknown-}
])
target="arm64-${target@%:@aarch64-}"
target_alias="arm64-${target_alias@%:@aarch64-}"
]) ])
AC_ARG_PROGRAM AC_ARG_PROGRAM
@ -3104,7 +3107,7 @@ AS_IF([test "$rb_cv_dlopen" = yes], [
AC_MSG_CHECKING([whether $flag is accepted for bundle]) AC_MSG_CHECKING([whether $flag is accepted for bundle])
: > conftest.c : > conftest.c
AS_IF([${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && AS_IF([${LDSHARED%%'$(CC)'*}$CC${LDSHARED@%:@*'$(CC)'} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
test ! -s conftest.err], [ test ! -s conftest.err], [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag]) RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])