jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #783 from morphis/explicit-search-path-for-boost

Browse source 
scripts: set explicit search path for libboost_log
This commit is contained in:
Simon Fels 2018-07-01 20:28:36 +02:00 • committed by GitHub
commit 685e3c140e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/container-manager.sh
View file

@ -20,6 +20,14 @@ if [ ! -e $ANDROID_IMG ]; then
exit 1 exit 1
fi fi
if [ "$SNAP_ARCH" == "amd64" ]; then
ARCH="x86_64-linux-gnu"
elif [ "$SNAP_ARCH" == "armhf" ]; then
ARCH="arm-linux-gnueabihf"
else
ARCH="$SNAP_ARCH-linux-gnu"
fi
start() { start() {
# Make sure our setup path for the container rootfs # Make sure our setup path for the container rootfs
# is present as lxc is statically configured for # is present as lxc is statically configured for
@ -41,7 +49,12 @@ start() {
fi fi
# liblxc.so.1 is in $SNAP/lib # liblxc.so.1 is in $SNAP/lib
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/lib export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/liblxc
# For unknown reason we got bug reports that the container manager failed to start
# because it cannot find libboost_log.so.1.58.0 To mitigate this we're adding the
# lib directory as explicit search target here.
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/$ARCH
if [ -d /sys/kernel/security/apparmor ] ; then if [ -d /sys/kernel/security/apparmor ] ; then
# Load the profile for our Android container # Load the profile for our Android container