SPK: include native libraries for all supported platforms

This commit is contained in:
Reinhard Pointner 2016-12-16 16:26:34 +08:00
parent a286a62f57
commit e060e7b1cb
2 changed files with 12 additions and 3 deletions

View File

@ -715,6 +715,12 @@
<package dir="${dir.installer}/spk/package" includes="*.sh" filemode="755" /> <package dir="${dir.installer}/spk/package" includes="*.sh" filemode="755" />
<package file="${path.fatjar}" fullpath="FileBot.jar" /> <package file="${path.fatjar}" fullpath="FileBot.jar" />
<!-- include native libraries for all supported platforms -->
<package prefix="lib/armv7l" dir="${dir.lib}/native/linux-armv7l" />
<package prefix="lib/armv8" dir="${dir.lib}/native/linux-armv8" />
<package prefix="lib/i686" dir="${dir.lib}/native/linux-i686" />
<package prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" />
<codesign secring="${dir.installer}/gpg/secring.gpg" keyid="${gpg.key}" password="${gpg.pwd}" /> <codesign secring="${dir.installer}/gpg/secring.gpg" keyid="${gpg.key}" password="${gpg.pwd}" />
</spk> </spk>
</target> </target>

View File

@ -38,11 +38,14 @@ export LC_ALL="en_US.UTF-8"
SYNO_FPCALC="/usr/local/chromaprint/bin/fpcalc" SYNO_FPCALC="/usr/local/chromaprint/bin/fpcalc"
SYNO_LIBRARY_PATH="/usr/local/mediainfo/lib:/usr/local/chromaprint/lib" SYNO_LIBRARY_PATH="/usr/local/mediainfo/lib:/usr/local/chromaprint/lib"
# add APP_ROOT to LD_LIBRARY_PATH # add package lib folder to library path
PACKAGE_LIBRARY_PATH="$APP_ROOT/lib/$(uname -m)"
# add PACKAGE_LIBRARY_PATH to LD_LIBRARY_PATH
if [ ! -z "$LD_LIBRARY_PATH" ]; then if [ ! -z "$LD_LIBRARY_PATH" ]; then
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SYNO_LIBRARY_PATH:$APP_ROOT" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SYNO_LIBRARY_PATH:$PACKAGE_LIBRARY_PATH"
else else
export LD_LIBRARY_PATH="$SYNO_LIBRARY_PATH:$APP_ROOT" export LD_LIBRARY_PATH="$SYNO_LIBRARY_PATH:$PACKAGE_LIBRARY_PATH"
fi fi
# choose extractor # choose extractor