jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss: install into image, remove nss and nspr from chromium

Browse Source 
Add nss dependency for x86 and arm to virtual/network.
This commit is contained in:
MilhouseVH 2017-10-18 19:42:55 +01:00
parent 65facfbc92
commit 335011af9d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/addons/addon-depends/nss/package.mk
View File

@ -73,4 +73,7 @@ makeinstall_target() {
mkdir -p $SYSROOT_PREFIX/usr/include/nss mkdir -p $SYSROOT_PREFIX/usr/include/nss
cp -RL dist/{public,private}/nss/* $SYSROOT_PREFIX/usr/include/nss cp -RL dist/{public,private}/nss/* $SYSROOT_PREFIX/usr/include/nss
cp -L dist/Linux*/lib/pkgconfig/nss.pc $SYSROOT_PREFIX/usr/lib/pkgconfig cp -L dist/Linux*/lib/pkgconfig/nss.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
mkdir -p .install_pkg/usr/lib
cp -PL dist/Linux*/lib/*.so .install_pkg/usr/lib
} }

6
packages/addons/browser/chromium/package.mk
View File

@ -161,12 +161,6 @@ addon() {
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules
cp -PL $(get_build_dir gdk-pixbuf)/.install_pkg/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules cp -PL $(get_build_dir gdk-pixbuf)/.install_pkg/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules
# nss
cp -PL $(get_build_dir nss)/dist/Linux*OPT.OBJ/lib/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib
# nspr
cp -PL $(get_build_dir nspr)/.install_pkg/usr/lib/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib
# libexif # libexif
cp -PL $(get_build_dir libexif)/.install_pkg/usr/lib/* $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir libexif)/.install_pkg/usr/lib/* $ADDON_BUILD/$PKG_ADDON_ID/lib

5
packages/virtual/network/package.mk
View File

@ -39,3 +39,8 @@ fi
if [ "$OPENVPN_SUPPORT" = "yes" ]; then if [ "$OPENVPN_SUPPORT" = "yes" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET openvpn" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET openvpn"
fi fi
# nss needed by inputstream.adaptive, chromium etc.
if [ "$TARGET_ARCH" = "x86_64" ] || [ "$TARGET_ARCH" = "arm" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET nss"
fi