From 5727c86ff41a0178f2b7ae3d8031f7170a590269 Mon Sep 17 00:00:00 2001 From: Adriano dos Santos Fernandes Date: Fri, 22 Apr 2022 21:23:13 -0300 Subject: [PATCH] Postfix for #7169 and MacOS build. --- .github/workflows/main.yml | 4 ++-- builds/posix/postfix.darwin | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 051219b643..8902ebffbe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -112,8 +112,8 @@ jobs: popd mkdir -p gen/Release/firebird/lib mkdir -p gen/Debug/firebird/lib - cp $ICU_INSTALL_PATH/lib/libicu{data,i18n,uc}.*dylib gen/Release/firebird/lib/ - cp $ICU_INSTALL_PATH/lib/libicu{data,i18n,uc}.*dylib gen/Debug/firebird/lib/ + cp -R $ICU_INSTALL_PATH/lib/libicu{data,i18n,uc}.*dylib gen/Release/firebird/lib/ + cp -R $ICU_INSTALL_PATH/lib/libicu{data,i18n,uc}.*dylib gen/Debug/firebird/lib/ - name: Build (MacOS) if: matrix.os == 'macOS-latest' diff --git a/builds/posix/postfix.darwin b/builds/posix/postfix.darwin index 18c6b1b4da..84338ab92d 100644 --- a/builds/posix/postfix.darwin +++ b/builds/posix/postfix.darwin @@ -42,7 +42,7 @@ framework: cp ../gen/$(TARGET)/firebird/lib/libtommath.dylib $(FB_FW)/Versions/A/Resources/lib/ cp ../gen/$(TARGET)/firebird/lib/libtomcrypt.dylib $(FB_FW)/Versions/A/Resources/lib/ cp ../gen/$(TARGET)/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Resources/lib/ - cp ../gen/$(TARGET)/firebird/lib/libicu{data,i18n,uc}.[0-9][0-9].dylib $(FB_FW)/Versions/A/Resources/lib/ + cp -R ../gen/$(TARGET)/firebird/lib/libicu{data,i18n,uc}.*dylib $(FB_FW)/Versions/A/Resources/lib/ cp ../gen/$(TARGET)/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Resources/lib/ ln -s ../Resources/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib ln -s ../Resources/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib