diff options
Diffstat (limited to 'yocto-poky/meta/recipes-support/nss')
-rw-r--r-- | yocto-poky/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch | 27 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-support/nss/nss_3.21.bb (renamed from yocto-poky/meta/recipes-support/nss/nss_3.19.2.bb) | 27 |
2 files changed, 49 insertions, 5 deletions
diff --git a/yocto-poky/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch b/yocto-poky/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch new file mode 100644 index 000000000..cb3ad0068 --- /dev/null +++ b/yocto-poky/meta/recipes-support/nss/nss/0001-Fix-build-failure-on-opensuse-13.1.patch @@ -0,0 +1,27 @@ +From 8758c6a4508a5ca01505a8d69a269c912ce10bee Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 18 Jan 2016 18:26:16 +0000 +Subject: [PATCH] Fix build failure on opensuse 13.1 + +Upstream-Status: Inappropriate [gcc 4.8 specific issue] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + nss/cmd/modutil/install-ds.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/cmd/modutil/install-ds.h b/nss/cmd/modutil/install-ds.h +index 3a3afb3..433efe0 100644 +--- a/nss/cmd/modutil/install-ds.h ++++ b/nss/cmd/modutil/install-ds.h +@@ -243,7 +243,7 @@ struct Pk11Install_Info_str { + Pk11Install_Info* + Pk11Install_Info_new(); + void +-Pk11Install_Info_init(); ++Pk11Install_Info_init(Pk11Install_Info* _this); + void + Pk11Install_Info_delete(Pk11Install_Info* _this); + /*// Returns NULL for success, error message if parse error.*/ +-- +1.8.4.5 + diff --git a/yocto-poky/meta/recipes-support/nss/nss_3.19.2.bb b/yocto-poky/meta/recipes-support/nss/nss_3.21.bb index 23a4a1f8d..d2e24112d 100644 --- a/yocto-poky/meta/recipes-support/nss/nss_3.19.2.bb +++ b/yocto-poky/meta/recipes-support/nss/nss_3.21.bb @@ -15,17 +15,21 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" SRC_URI = "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_2_RTM/src/${BP}.tar.gz \ + http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${BP}.tar.gz \ file://nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ file://nss-fix-nsinstall-build.patch \ + file://0001-Fix-build-failure-on-opensuse-13.1.patch \ file://nss.pc.in \ file://signlibs.sh \ " -SRC_URI[md5sum] = "b02ffd1e8e8ef5f8512fa02d8ca9db3d" -SRC_URI[sha256sum] = "1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae" +SRC_URI[md5sum] = "3c8b2ed880dd3a8d86c9e0151afe6eba" +SRC_URI[sha256sum] = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239" + +UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" +UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" inherit siteinfo @@ -38,6 +42,10 @@ TDS = "${S}/tentative-dist-staging" TARGET_CC_ARCH += "${LDFLAGS}" +do_configure_prepend_libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + do_compile_prepend_class-native() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE} export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} @@ -47,6 +55,11 @@ do_compile_prepend_class-nativesdk() { export LDFLAGS="" } +do_compile_prepend_class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + do_compile() { export CROSS_COMPILE=1 export NATIVE_CC="gcc" @@ -81,12 +94,15 @@ do_compile() { export USE_X32=1 fi + export NSS_DISABLE_GTESTS=1 + # We can modify CC in the environment, but if we set it via an # argument to make, nsinstall, a host program, will also build with it! # export CC="${CC} -g" make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" } @@ -126,6 +142,8 @@ do_install() { export USE_X32=1 fi + export NSS_DISABLE_GTESTS=1 + make -C ./nss \ CCC="${CXX}" \ OS_TEST=${OS_TEST} \ @@ -217,7 +235,6 @@ FILES_${PN}-dev = "\ ${libdir}/pkgconfig/* \ ${includedir}/* \ " -# FILES_${PN}-dbg is populated automatically BBCLASSEXTEND = "native nativesdk" |