From 6cadc2e38b1cefe879fb97fd192e39cb102c4d3c Mon Sep 17 00:00:00 2001 From: Radostan Riedel Date: Wed, 18 Oct 2017 19:42:55 +0100 Subject: [PATCH] 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@