Skip to content

Commit ea60866

Browse files
committed
fix sed cmd
1 parent eb5a4fd commit ea60866

File tree

4 files changed

+35
-13
lines changed

4 files changed

+35
-13
lines changed

do-compile/android/any.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ do_lipo_lib() {
3131
local lib_dir="$MR_PRODUCT_ROOT/$LIB_NAME-$arch"
3232

3333
if [ -d "$lib_dir" ]; then
34-
# Fix .pc files
35-
sed -i.bak 's|-lpthread|-pthread|' "$lib_dir"/lib/pkgconfig/*.pc
36-
find "$lib_dir"/lib/pkgconfig -name "*.bak" -delete
37-
34+
my_sed_i "s|-lpthread|-pthread|" "$lib_dir"/lib/pkgconfig/*.pc
3835
# Copy the directory
3936
mkdir -p "$MR_UNI_PROD_DIR/$LIB_NAME"
4037
cp -Rf "$lib_dir" "$MR_UNI_PROD_DIR/$LIB_NAME"

tools/export-android-host-env.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,19 @@ function install_depends() {
2727
echo "[✅] ${name}: $(eval $name --version)"
2828
}
2929

30+
# 定义跨平台sed函数
31+
my_sed_i() {
32+
if [[ "$(uname)" == "Darwin" ]]; then
33+
# macOS系统
34+
sed -i '' "$@"
35+
else
36+
# Linux系统及其他系统
37+
sed -i "$@"
38+
fi
39+
}
40+
41+
export -f my_sed_i
42+
3043
case "$OSTYPE" in
3144
darwin*) HOST_TAG="darwin-x86_64"; export -f install_depends ;;
3245
linux*) HOST_TAG="linux-x86_64" ;;

tools/export-apple-host-env.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,16 @@ function install_depends() {
4343
echo "[✅] ${name}: $(eval $name --version)"
4444
}
4545

46-
export -f install_depends
46+
# 定义跨平台sed函数
47+
my_sed_i() {
48+
if [[ "$(uname)" == "Darwin" ]]; then
49+
# macOS系统
50+
sed -i '' "$@"
51+
else
52+
# Linux系统及其他系统
53+
sed -i "$@"
54+
fi
55+
}
56+
57+
export -f install_depends
58+
export -f my_sed_i

tools/parse-arguments.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,21 @@ function correct_pc_file(){
9292

9393
echo "fix pc files in folder: $fix_path"
9494
cd "$fix_path"
95-
95+
9696
for pc in `find . -type f -name "*.pc"` ;
9797
do
9898
local pkgconfig=$(cd $(dirname "$pc"); pwd)
9999
local lib_dir=$(cd $(dirname "$pkgconfig"); pwd)
100100
local base_dir=$(cd $(dirname "$lib_dir"); pwd)
101101
local include_dir="${base_dir}/include"
102102
local bin_dir="${base_dir}/bin"
103-
104-
sed -i "" "s|^prefix=.*|prefix=$base_dir|" "$pc"
105-
sed -i "" "s|^exec_prefix=[^$].*|exec_prefix=$bin_dir|" $pc
106-
sed -i "" "s|^libdir=[^$].*|libdir=$lib_dir|" "$pc"
107-
sed -i "" "s|^includedir=[^$].*include|includedir=$include_dir|" "$pc"
108-
sed -i "" "s|-L/[^ ]*lib|-L$lib_dir|" "$pc"
109-
sed -i "" "s|-I/[^ ]*include|-I$include_dir|" "$pc"
103+
104+
my_sed_i "s|^prefix=.*|prefix=$base_dir|" "$pc"
105+
my_sed_i "s|^exec_prefix=[^$].*|exec_prefix=$bin_dir|" $pc
106+
my_sed_i "s|^libdir=[^$].*|libdir=$lib_dir|" "$pc"
107+
my_sed_i "s|^includedir=[^$].*include|includedir=$include_dir|" "$pc"
108+
my_sed_i "s|-L/[^ ]*lib|-L$lib_dir|" "$pc"
109+
my_sed_i "s|-I/[^ ]*include|-I$include_dir|" "$pc"
110110
done
111111

112112
cd "$dir"

0 commit comments

Comments
 (0)