Skip to content

Commit 5207df0

Browse files
committed
Force use of gsed on macos to make sure the syntax is the same for all runners.
1 parent 655e585 commit 5207df0

File tree

8 files changed

+9
-3
lines changed

8 files changed

+9
-3
lines changed

.github/build/linux-arm64/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export CONFIGURE="./configure"
2727
export CONFIGURE_OPTIONS="--host aarch64-linux-gnu"
2828
export MAKE="make -j$(nproc)"
2929
export MESON_OPTIONS="--cross-file=$SCRIPT_PATH/cross-compilation.meson"
30+
export SED="sed"
3031

3132
# Library specific options
3233
export DE265_OPTIONS=""

.github/build/linux-musl-x64/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export CONFIGURE="./configure"
2727
export CONFIGURE_OPTIONS=""
2828
export MAKE="make -j$(nproc)"
2929
export MESON_OPTIONS=""
30+
export SED="sed"
3031

3132
# Library specific options
3233
export DE265_OPTIONS=""

.github/build/linux-x64/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export CONFIGURE="./configure"
2727
export CONFIGURE_OPTIONS=""
2828
export MAKE="make -j$(nproc)"
2929
export MESON_OPTIONS=""
30+
export SED="sed"
3031

3132
# Library specific options
3233
export DE265_OPTIONS=""

.github/build/macos-arm64/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export CONFIGURE="./configure"
2727
export CONFIGURE_OPTIONS="--host arm64-apple-macos13"
2828
export MAKE="make -j$(sysctl -n hw.logicalcpu)"
2929
export MESON_OPTIONS="--cross-file=$SCRIPT_PATH/cross-compilation.meson"
30+
export SED="gsed"
3031

3132
# Library specific options
3233
export DE265_OPTIONS=""

.github/build/macos-x64/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export CONFIGURE="./configure"
2727
export CONFIGURE_OPTIONS=""
2828
export MAKE="make -j$(sysctl -n hw.logicalcpu)"
2929
export MESON_OPTIONS=""
30+
export SED="gsed"
3031

3132
# Library specific options
3233
export DE265_OPTIONS=""

.github/build/shared/cairo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ mkdir __build
1010
cd __build
1111
CFLAGS=$FLAGS meson setup .. $MESON_OPTIONS --buildtype=$MESON_BUILD_TYPE --prefix=$INSTALL_PREFIX --default-library=static -Dxlib=disabled -Dquartz=disabled -Dfontconfig=enabled -Dfreetype=enabled -Dtests=disabled
1212

13-
sed -i 's/#define CAIRO_HAS_PTHREAD 1/#define CAIRO_NO_MUTEX 1/' config.h
13+
$SED -i 's/#define CAIRO_HAS_PTHREAD 1/#define CAIRO_NO_MUTEX 1/' config.h
1414

1515
ninja install

.github/build/shared/ffi.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

44
cd Dependencies/ffi
55

6-
sed -i 's/AC_PREREQ(\[2.71\])//' configure.ac
7-
sed -i 's/AC_CHECK_INCLUDES_DEFAULT//' configure.ac
6+
$SED -i 's/AC_PREREQ(\[2.71\])//' configure.ac
7+
$SED -i 's/AC_CHECK_INCLUDES_DEFAULT//' configure.ac
88
rm include/ffi.h
99
rm include/fficonfig.h
1010

.github/build/wasm-x86/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export CONFIGURE="emconfigure ./configure"
2727
export CONFIGURE_OPTIONS="--host aarch64-linux-gnu"
2828
export MAKE="emmake make -j$(nproc)"
2929
export MESON_OPTIONS="--cross-file=$SCRIPT_PATH/cross-compilation.meson"
30+
export SED="sed"
3031

3132
# Library specific options
3233
export DE265_OPTIONS="--disable-sse"

0 commit comments

Comments
 (0)