Skip to content

Move installation of system libraries. #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddennedy merged 1 commit into from
Nov 3, 2018
Merged

Move installation of system libraries. #656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions scripts/build-shotcut.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,14 +1644,6 @@ function configure_compile_install_subproject {
cmd cp -a "$QTDIR"/plugins/{accessible,iconengines,imageformats,mediaservice,platforms,generic,platforminputcontexts,platformthemes,xcbglintegrations} "$FINAL_INSTALL_DIR"/lib/qt5
cmd cp -p "$QTDIR"/plugins/sqldrivers/libqsqlite.so "$FINAL_INSTALL_DIR"/lib/qt5/sqldrivers
cmd cp -a "$QTDIR"/qml "$FINAL_INSTALL_DIR"/lib

log Copying some libs from system
for lib in "$FINAL_INSTALL_DIR"/lib/qt5/{iconengines,imageformats,mediaservice,platforms,generic,platforminputcontexts,platformthemes,xcbglintegrations}/*.so; do
bundle_libs "$lib"
done
for lib in "$FINAL_INSTALL_DIR"/{lib,lib/mlt,lib/frei0r-1,lib/ladspa}/*.so*; do
bundle_libs "$lib"
done
fi
elif test "webvfx" = "$1" ; then
cmd make -C webvfx install || die "Unable to install $1/webvfx"
Expand Down Expand Up @@ -1699,6 +1691,17 @@ function configure_compile_install_all {
for DIR in $SUBDIRS ; do
configure_compile_install_subproject $DIR
done

if [ "$ARCHIVE" = "1" ]; then
log Copying some libs from system
for lib in "$FINAL_INSTALL_DIR"/lib/qt5/{iconengines,imageformats,mediaservice,platforms,generic,platforminputcontexts,platformthemes,xcbglintegrations}/*.so; do
bundle_libs "$lib"
done
for lib in "$FINAL_INSTALL_DIR"/{lib,lib/mlt,lib/frei0r-1,lib/ladspa}/*.so*; do
bundle_libs "$lib"
done
fi

feedback_status Done configuring, compiling and installing all sources
}

Expand Down Expand Up @@ -1754,7 +1757,7 @@ function sys_info {
function bundle_libs
{
target=$(dirname "$1")/$(basename "$1")
log bundling library dependencies of "$lib"
log bundling library dependencies of $(basename "$1")
libs=$(ldd "$target" |
awk '($3 ~ /^\/(lib|usr)\//) &&
($3 !~ /\/libld-linux\./) &&
Expand Down