From 081a644c5e62e2f9dce7e28d3eacbb761101b9ae Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 18 Oct 2017 19:42:55 +0100 Subject: [PATCH 1/5] nss: use system sqlite to avoid trashing toolchain --- packages/addons/addon-depends/nss/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/addon-depends/nss/package.mk b/packages/addons/addon-depends/nss/package.mk index 6e5ec7849e..394bfb35a9 100644 --- a/packages/addons/addon-depends/nss/package.mk +++ b/packages/addons/addon-depends/nss/package.mk @@ -55,6 +55,7 @@ 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 \ OS_TEST=$TARGET_ARCH \ From 6cadc2e38b1cefe879fb97fd192e39cb102c4d3c Mon Sep 17 00:00:00 2001 From: Radostan Riedel Date: Wed, 18 Oct 2017 19:42:55 +0100 Subject: [PATCH 2/5] nss: Add 2 patches required to build with arm set NSS_USE_SYSTEM_SQLITE Signed-off-by: Radostan Riedel --- packages/addons/addon-depends/nss/package.mk | 1 + .../nss/patches/nss-04-skip_shlibsign.patch | 12 ++++++++++++ .../nss/patches/nss-05-disable_host_cflags.patch | 12 ++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 packages/addons/addon-depends/nss/patches/nss-04-skip_shlibsign.patch create mode 100644 packages/addons/addon-depends/nss/patches/nss-05-disable_host_cflags.patch diff --git a/packages/addons/addon-depends/nss/package.mk b/packages/addons/addon-depends/nss/package.mk index 394bfb35a9..5d8b376272 100644 --- a/packages/addons/addon-depends/nss/package.mk +++ b/packages/addons/addon-depends/nss/package.mk @@ -58,6 +58,7 @@ make_target() { 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 \ diff --git a/packages/addons/addon-depends/nss/patches/nss-04-skip_shlibsign.patch b/packages/addons/addon-depends/nss/patches/nss-04-skip_shlibsign.patch new file mode 100644 index 0000000000..dfee7cd0ed --- /dev/null +++ b/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 + diff --git a/packages/addons/addon-depends/nss/patches/nss-05-disable_host_cflags.patch b/packages/addons/addon-depends/nss/patches/nss-05-disable_host_cflags.patch new file mode 100644 index 0000000000..67fb94c3cc --- /dev/null +++ b/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@ From d36d7f6ccc01ac07cfa8d781baa767cf795728dc Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 18 Oct 2017 19:42:55 +0100 Subject: [PATCH 3/5] nss: use 64-bit host includes --- packages/addons/addon-depends/nss/package.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/nss/package.mk b/packages/addons/addon-depends/nss/package.mk index 5d8b376272..7f411b4d94 100644 --- a/packages/addons/addon-depends/nss/package.mk +++ b/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() { From 65facfbc9238e38f20c89d4bb60cba71ce67fb78 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 18 Oct 2017 19:42:55 +0100 Subject: [PATCH 4/5] inputstream.adaptive: add nss dependency for x86_64 and arm --- .../kodi-binary-addons/inputstream.adaptive/package.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index 73d841b4fb..7ddb060482 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/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 From 335011af9df14666d83ecb778938525bc9f6253a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 18 Oct 2017 19:42:55 +0100 Subject: [PATCH 5/5] nss: install into image, remove nss and nspr from chromium Add nss dependency for x86 and arm to virtual/network. --- packages/addons/addon-depends/nss/package.mk | 3 +++ packages/addons/browser/chromium/package.mk | 6 ------ packages/virtual/network/package.mk | 5 +++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/addons/addon-depends/nss/package.mk b/packages/addons/addon-depends/nss/package.mk index 7f411b4d94..81ed9c7024 100644 --- a/packages/addons/addon-depends/nss/package.mk +++ b/packages/addons/addon-depends/nss/package.mk @@ -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 } diff --git a/packages/addons/browser/chromium/package.mk b/packages/addons/browser/chromium/package.mk index 96d27db019..11940b21e3 100644 --- a/packages/addons/browser/chromium/package.mk +++ b/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 diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk index b5b0adf1e9..09dab0117e 100644 --- a/packages/virtual/network/package.mk +++ b/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