Skip to content

Commit bbfcb60

Browse files
SersemPecaalehander92
authored andcommitted
feat(AppImage): Don't depent on LD_LIBRARY_PATH, set relative rpath instead
1 parent 68ab024 commit bbfcb60

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

appimage-scripts/build_appimage.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ cat << 'EOF' > "${APP_DIR}/bin/ct"
110110
HERE=${HERE:-$(dirname "$(readlink -f "${0}")")}
111111
112112
# TODO: This includes references to x86_64. What about aarch64?
113-
export LD_LIBRARY_PATH="${HERE}/ruby/lib:${HERE}/lib:/usr/lib/:/usr/lib64/:/usr/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}"
114113
115114
exec "${HERE}"/bin/ct_unwrapped "$@"
116115
@@ -201,7 +200,6 @@ cat << 'EOF' > "${APP_DIR}/AppRun"
201200
export HERE=$(dirname "$(readlink -f "${0}")")
202201
203202
# TODO: This includes references to x86_64. What about aarch64?
204-
export LD_LIBRARY_PATH="${HERE}/ruby/lib:${HERE}/lib:/usr/lib/:/usr/lib64/:/usr/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}"
205203
export LINKS_PATH_DIR=$HERE
206204
export PATH="${HERE}/bin:${PATH}"
207205
export CODETRACER_RUBY_RECORDER_PATH="${HERE}/codetracer-ruby-recorder/gems/codetracer-pure-ruby-recorder/bin/codetracer-pure-ruby-recorder"
@@ -257,6 +255,7 @@ fi
257255
patchelf --set-interpreter "${INTERPRETER_PATH}" "${APP_DIR}"/bin/ct_unwrapped
258256
patchelf --set-interpreter "${INTERPRETER_PATH}" "${APP_DIR}"/bin/db-backend
259257
patchelf --set-interpreter "${INTERPRETER_PATH}" "${APP_DIR}"/bin/db-backend-record
258+
patchelf --set-interpreter "${INTERPRETER_PATH}" "${APP_DIR}"/bin/backend-manager
260259
patchelf --set-interpreter "${INTERPRETER_PATH}" "${APP_DIR}"/bin/nargo
261260
patchelf --set-interpreter "${INTERPRETER_PATH}" "${APP_DIR}"/bin/wazero
262261
patchelf --set-interpreter "${INTERPRETER_PATH}" "${APP_DIR}"/bin/ctags
@@ -269,14 +268,25 @@ patchelf --set-interpreter "${INTERPRETER_PATH}" "${APP_DIR}"/ruby/bin/ruby
269268
patchelf --remove-rpath "${APP_DIR}"/bin/ct_unwrapped
270269
patchelf --remove-rpath "${APP_DIR}"/bin/db-backend
271270
patchelf --remove-rpath "${APP_DIR}"/bin/db-backend-record
271+
patchelf --remove-rpath "${APP_DIR}"/bin/backend-manager
272272
patchelf --remove-rpath "${APP_DIR}"/bin/nargo
273273
patchelf --remove-rpath "${APP_DIR}"/bin/wazero
274274
patchelf --remove-rpath "${APP_DIR}"/bin/ctags
275275
patchelf --remove-rpath "${APP_DIR}"/bin/curl
276276
patchelf --remove-rpath "${APP_DIR}"/bin/node
277277
patchelf --remove-rpath "${APP_DIR}"/ruby/bin/ruby
278278

279-
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}/bin/node"
279+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/node
280+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/ct_unwrapped
281+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/db-backend
282+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/db-backend-record
283+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/backend-manager
284+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/nargo
285+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/wazero
286+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/ctags
287+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/curl
288+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/bin/node
289+
patchelf --set-rpath "\$ORIGIN/../lib" "${APP_DIR}"/ruby/bin/ruby
280290

281291
APPIMAGE_ARCH=$CURRENT_ARCH
282292
if [[ "$APPIMAGE_ARCH" == "aarch64" ]]; then

0 commit comments

Comments
 (0)