diff --git a/meta-webos/recipes-extended/mozjs/mozjs_%.bbappend b/meta-webos/recipes-extended/mozjs/mozjs_%.bbappend deleted file mode 100644 index 0add83bc1..000000000 --- a/meta-webos/recipes-extended/mozjs/mozjs_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2018 LG Electronics, Inc. - -EXTENDPRAUTO_append = "webos1" -EXTRA_OECONF += "--with-nspr-cflags='-I${STAGING_INCDIR}/nspr -I${STAGING_INCDIR}/nss3'" diff --git a/meta-webos/recipes-support/nspr/nspr_%.bbappend b/meta-webos/recipes-support/nspr/nspr_%.bbappend deleted file mode 100644 index 96b3ec573..000000000 --- a/meta-webos/recipes-support/nspr/nspr_%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2018-2020 LG Electronics, Inc. - -EXTENDPRAUTO_append = "webos1" - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" -do_install_append() { - sed -i \ - -e 's:${includedir}:${includedir}/nspr:g' \ - -e 's:Cflags\::Cflags\: -I${includedir}/nspr:g' \ - ${D}${libdir}/pkgconfig/nspr.pc -} diff --git a/meta-webos/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-webos/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch deleted file mode 100644 index 803c06b21..000000000 --- a/meta-webos/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -28,6 +29,7 @@ - * that compiler uses -mfpu=neon only. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta-webos/recipes-support/nss/nss/nss.pc.in b/meta-webos/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ecb3..000000000 --- a/meta-webos/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta-webos/recipes-support/nss/nss_%.bbappend b/meta-webos/recipes-support/nss/nss_%.bbappend deleted file mode 100644 index c14c9a619..000000000 --- a/meta-webos/recipes-support/nss/nss_%.bbappend +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright (c) 2018-2020 LG Electronics, Inc. - -EXTENDPRAUTO_append = "webos1" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -do_compile() { - # LG next line is the only change here, we need to export NSPR_INCLUDE_DIR after do_compile_prepend_class-native - # from upstream recipe, that's why we cannot use another do_compile_prepend in .bbappend - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - 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! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -}