Skip to content
This repository has been archived by the owner on Nov 30, 2024. It is now read-only.

Commit

Permalink
fix rpath of scel2org5
Browse files Browse the repository at this point in the history
  • Loading branch information
eagleoflqj committed Apr 20, 2024
1 parent 25e5d66 commit 6274b33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ROOT=`pwd`
ADDON_ROOT=$ROOT/fcitx5-$name
DESTDIR=$ROOT/build/$name
CACHE_DIR=$ROOT/cache
APP_CONTENTS_PATH="/Library/Input Methods/Fcitx5.app/Contents"

# This is the same with INSTALL_PREFIX of prebuilder
INSTALL_PREFIX=/tmp/fcitx5
Expand All @@ -30,7 +31,7 @@ f5m_configure() {
PKG_CONFIG_PATH=$INSTALL_PREFIX/lib/pkgconfig cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
-DCMAKE_FIND_ROOT_PATH="/Library/Input Methods/Fcitx5.app/Contents;$INSTALL_PREFIX" \
-DCMAKE_FIND_ROOT_PATH="$APP_CONTENTS_PATH;$INSTALL_PREFIX" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=13 \
-DCMAKE_OSX_ARCHITECTURES=$ARCH "$@"
}
Expand All @@ -44,7 +45,7 @@ f5m_install() {
DESTDIR=$DESTDIR cmake --install build
for dep in "$@"; do
file=$dep-$ARCH.tar.bz2
tar xjvf $CACHE_DIR/$file -C $DESTDIR$INSTALL_PREFIX bin share
tar xjvf $CACHE_DIR/$file -C $DESTDIR$INSTALL_PREFIX --exclude include --exclude lib
done
}

Expand Down
1 change: 1 addition & 0 deletions scripts/chinese-addons.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ARGS=(
-DCMAKE_CXX_FLAGS="-I$INSTALL_PREFIX/include/Fcitx5/Module/fcitx-module/luaaddonloader"
-DENABLE_TEST=OFF
-DENABLE_GUI=OFF
"-DCMAKE_INSTALL_RPATH=$APP_CONTENTS_PATH/lib" # scel2org5
)

if [[ $ARCH != $(uname -m) ]]; then
Expand Down

0 comments on commit 6274b33

Please sign in to comment.