Merge pull request #1791 from MilhouseVH/add_nss

nss/nspr: include in main image [rfc]

packages/addons/addon-depends/nss/package.mk

@@ -36,9 +36,7 @@ MAKEFLAGS=-j1
 make_host() {
   cd $PKG_BUILD/nss
 
-  [ "$TARGET_ARCH" = "x86_64" ] && export USE_64=1
-
-  make -C coreconf/nsinstall
+  make USE_64=1 -C coreconf/nsinstall
 }
 
 makeinstall_host() {
@@ -55,8 +53,10 @@ make_target() {
   [ "$TARGET_ARCH" = "x86_64" ] && TARGET_USE_64="USE_64=1"
 
   make BUILD_OPT=1 $TARGET_USE_64 \
+     NSS_USE_SYSTEM_SQLITE=1 \
      NSPR_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include/nspr \
      USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
+     SKIP_SHLIBSIGN=1 \
      OS_TEST=$TARGET_ARCH \
      NSS_TESTS="dummy" \
      NSINSTALL=$TOOLCHAIN/bin/nsinstall \
@@ -73,4 +73,7 @@ makeinstall_target() {
   mkdir -p $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
+
+  mkdir -p .install_pkg/usr/lib
+    cp -PL dist/Linux*/lib/*.so .install_pkg/usr/lib
 }

packages/addons/addon-depends/nss/patches/nss-04-skip_shlibsign.patch

@@ -0,0 +1,12 @@
+diff -Naur nss-3.29.5.orig/nss/cmd/shlibsign/Makefile nss-3.29.5/nss/cmd/shlibsign/Makefile
+--- nss-3.29.5.orig/nss/cmd/shlibsign/Makefile	2017-09-08 10:56:01.663876686 +0200
++++ nss-3.29.5/nss/cmd/shlibsign/Makefile	2017-09-08 10:57:19.659306831 +0200
+@@ -95,5 +95,7 @@
+     endif
+ endif
+ 
+-libs install :: $(CHECKLOC)
++ifndef SKIP_SHLIBSIGN
++	libs install :: $(CHECKLOC)
++endif
+ 

packages/addons/addon-depends/nss/patches/nss-05-disable_host_cflags.patch

@@ -0,0 +1,12 @@
+diff -Naur nss-3.29.5.orig/nspr/config/autoconf.mk.in nss-3.29.5/nspr/config/autoconf.mk.in
+--- nss-3.29.5.orig/nspr/config/autoconf.mk.in	2017-09-08 11:03:27.572619156 +0200
++++ nss-3.29.5/nspr/config/autoconf.mk.in	2017-09-08 11:03:41.100520343 +0200
+@@ -104,7 +104,7 @@
+ RESOLVE_LINK_SYMBOLS = @RESOLVE_LINK_SYMBOLS@
+ 
+ HOST_CC		= @HOST_CC@
+-HOST_CFLAGS	= @HOST_CFLAGS@
++#HOST_CFLAGS	= @HOST_CFLAGS@
+ HOST_LDFLAGS	= @HOST_LDFLAGS@
+ 
+ DEFINES		= @DEFINES@ @DEFS@

packages/addons/browser/chromium/package.mk

@@ -161,12 +161,6 @@ addon() {
   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
 
-  # 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
   cp -PL $(get_build_dir libexif)/.install_pkg/usr/lib/* $ADDON_BUILD/$PKG_ADDON_ID/lib
 

packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk

@@ -29,6 +29,10 @@ PKG_LONGDESC="inputstream.adaptive"
 
 PKG_IS_ADDON="yes"
 
+if [ "$TARGET_ARCH" = "x86_64" ] || [ "$TARGET_ARCH" = "arm" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET nss"
+fi
+
 addon() {
   install_binary_addon $PKG_ADDON_ID
 

packages/virtual/network/package.mk

@@ -39,3 +39,8 @@ fi
 if [ "$OPENVPN_SUPPORT" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET openvpn"
 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