From patchwork Wed Nov 27 15:18:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 21811 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 01FF323FD2 for ; Wed, 27 Nov 2013 15:19:05 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id oy12sf17319442veb.1 for ; Wed, 27 Nov 2013 07:19:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=6OOU4bhV9yEcEDhWm2CXZZq5+ts+oYrNZq2wQ6BWieA=; b=lY7GvnO26+5Hkbe5tLZhQNEcqD8HoAwL13asMb7R4Y5zMRhy6Z3Nvr4slHkqrKnxhU X1nADD79qAi+Zpw4oUSwpkv92S+i4VilbmnAaMuY1NcAQSSywz8NeG/Qz2AhmNorolvI 3D38j3mcTgnm4NTLNEdvQ1rQikpdaAEkxgpX5ealf3y65IIfSYyk3FxDFK0WkLnRXz52 bZMa4v7HZlMBEVm6QHVqhH15boXn18binsziECXydNnSLh3+ehlffivyIughvGGiE3XI d97HUISSgBPFY8x0eOZPhIxMX5y4838pi7N+BMKVwXG/hBmzL8xTBxcoSGRdPp8kZLu1 xlCA== X-Gm-Message-State: ALoCoQkBKFknB1+EmUDhGWC31gsd+aaraZ0ktorNTOMkziKb1zaU6++W49VxXppsnWNlveEo1qki X-Received: by 10.58.46.36 with SMTP id s4mr12087040vem.18.1385565545240; Wed, 27 Nov 2013 07:19:05 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.180 with SMTP id s20ls3163977qeq.37.gmail; Wed, 27 Nov 2013 07:19:05 -0800 (PST) X-Received: by 10.52.50.177 with SMTP id d17mr12430860vdo.23.1385565545099; Wed, 27 Nov 2013 07:19:05 -0800 (PST) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id 1si21219223vel.150.2013.11.27.07.19.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 Nov 2013 07:19:05 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id p6so5083704vbe.13 for ; Wed, 27 Nov 2013 07:19:05 -0800 (PST) X-Received: by 10.52.227.233 with SMTP id sd9mr239056vdc.53.1385565544923; Wed, 27 Nov 2013 07:19:04 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp293006vcz; Wed, 27 Nov 2013 07:19:04 -0800 (PST) X-Received: by 10.180.77.49 with SMTP id p17mr23371881wiw.30.1385565543628; Wed, 27 Nov 2013 07:19:03 -0800 (PST) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id ym3si21461305wjc.94.2013.11.27.07.19.02 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 27 Nov 2013 07:19:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of voipio@kos.to designates 92.243.29.197 as permitted sender) client-ip=92.243.29.197; Received: from kos.to (91-157-196-38.elisa-laajakaista.fi [91.157.196.38]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id BF78026551 for ; Wed, 27 Nov 2013 16:19:01 +0100 (CET) Received: from voipio (uid 1000) (envelope-from voipio@kos.to) id 5e06d5 by kos.to (DragonFly Mail Agent); Wed, 27 Nov 2013 17:19:00 +0200 From: Riku Voipio To: openembedded-devel@lists.openembedded.org Cc: patches@linaro.org, otavio@ossystems.com.br, Riku Voipio Subject: [meta-browser][PATCH] nss: remove Date: Wed, 27 Nov 2013 17:18:54 +0200 Message-Id: <1385565534-17423-1-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.8.1.2 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , nss has been added to OE-core, so an old copy in meta-browser is just confusing. Signed-off-by: Riku Voipio --- recipes-support/nss/nss-3.13.3/native_cc.patch | 55 ---------- recipes-support/nss/nss-3.13.3/nss.pc.in | 11 -- recipes-support/nss/nss-3.13.3/skip_signing.patch | 18 ---- recipes-support/nss/nss_3.13.3.bb | 116 ---------------------- 4 files changed, 200 deletions(-) delete mode 100644 recipes-support/nss/nss-3.13.3/native_cc.patch delete mode 100644 recipes-support/nss/nss-3.13.3/nss.pc.in delete mode 100644 recipes-support/nss/nss-3.13.3/skip_signing.patch delete mode 100644 recipes-support/nss/nss_3.13.3.bb diff --git a/recipes-support/nss/nss-3.13.3/native_cc.patch b/recipes-support/nss/nss-3.13.3/native_cc.patch deleted file mode 100644 index 41d4980..0000000 --- a/recipes-support/nss/nss-3.13.3/native_cc.patch +++ /dev/null @@ -1,55 +0,0 @@ -we need to override ARCHFLAG as well since this is set to either -m32 or -m64 -and LDFLAGS add it explicitly which means when NATIVE_CC is defined then we build -the objects as 64bit but link them to be 32bit binary which may not fly - -Signed-off-by: Khem Raj -Index: mozilla/security/coreconf/mkdepend/Makefile -=================================================================== ---- mozilla.orig/security/coreconf/mkdepend/Makefile 2013-01-09 13:23:51.747694602 -0800 -+++ mozilla/security/coreconf/mkdepend/Makefile 2013-01-09 13:56:27.003734720 -0800 -@@ -64,11 +64,11 @@ - endif - - ifdef NATIVE_CC --CC=$(NATIVE_CC) -+override CC=$(NATIVE_CC) - endif - - ifdef NATIVE_FLAGS --OS_CFLAGS=$(NATIVE_FLAGS) -+override OS_CFLAGS=$(NATIVE_FLAGS) - endif - - include $(DEPTH)/coreconf/rules.mk -Index: mozilla/security/coreconf/nsinstall/Makefile -=================================================================== ---- mozilla.orig/security/coreconf/nsinstall/Makefile 2013-01-09 13:23:51.747694602 -0800 -+++ mozilla/security/coreconf/nsinstall/Makefile 2013-01-09 13:56:11.775734407 -0800 -@@ -58,11 +58,11 @@ - endif - - ifdef NATIVE_CC --CC=$(NATIVE_CC) -+override CC=$(NATIVE_CC) - endif - - ifdef NATIVE_FLAGS --OS_CFLAGS=$(NATIVE_FLAGS) -+override OS_CFLAGS=$(NATIVE_FLAGS) - endif - - include $(DEPTH)/coreconf/rules.mk -Index: mozilla/security/coreconf/Linux.mk -=================================================================== ---- mozilla.orig/security/coreconf/Linux.mk 2013-01-09 13:50:01.427726808 -0800 -+++ mozilla/security/coreconf/Linux.mk 2013-01-09 13:55:58.815734141 -0800 -@@ -98,6 +98,9 @@ - endif - endif - -+ifdef NATIVE_FLAGS -+ override ARCHFLAG= -+endif - - LIBC_TAG = _glibc - diff --git a/recipes-support/nss/nss-3.13.3/nss.pc.in b/recipes-support/nss/nss-3.13.3/nss.pc.in deleted file mode 100644 index abbc850..0000000 --- a/recipes-support/nss/nss-3.13.3/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Mozilla Network Security Services -Version: @VERSION@ -Requires: nspr -Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3 -Cflags: -I${includedir} -I${includedir}/mozilla/nss diff --git a/recipes-support/nss/nss-3.13.3/skip_signing.patch b/recipes-support/nss/nss-3.13.3/skip_signing.patch deleted file mode 100644 index 64e440d..0000000 --- a/recipes-support/nss/nss-3.13.3/skip_signing.patch +++ /dev/null @@ -1,18 +0,0 @@ -# HG changeset patch -# User Ted Mielczarek -# Date 1314190279 14400 -# Node ID a993dd883a502a15d0a8acebb7bf31fdbd0fd18f -# Parent 5a4a2b65e7b4950aa7cadc03aac43489ee314ba7 -[mq]: skip-shlibsigh - -diff --git a/security/nss/cmd/shlibsign/Makefile b/security/nss/cmd/shlibsign/Makefile ---- a/security/nss/cmd/shlibsign/Makefile -+++ b/security/nss/cmd/shlibsign/Makefile -@@ -120,5 +120,6 @@ - $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) - endif - -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) -- -+endif diff --git a/recipes-support/nss/nss_3.13.3.bb b/recipes-support/nss/nss_3.13.3.bb deleted file mode 100644 index ac77547..0000000 --- a/recipes-support/nss/nss_3.13.3.bb +++ /dev/null @@ -1,116 +0,0 @@ -DESCRIPTION = "Mozilla's SSL and TLS implementation" -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" - -PR = "r4" - -LICENSE = "MPL1.1 GPL LGPL" -LIC_FILES_CHKSUM = "file://security/nss/manifest.mn;md5=d71978748f23eae3156c38ac2a691924" - -DEPENDS = "sqlite3 nspr nspr-native" - -SRC_URI = "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/${PN}-${PV}.tar.gz \ - file://nss.pc.in \ - file://skip_signing.patch \ - file://native_cc.patch \ -" - -S = "${WORKDIR}/${P}/mozilla" - -SRC_URI[md5sum] = "006cb82fa900e9e664b4b14a9b7810ca" -SRC_URI[sha256sum] = "efa10f2c70da4bddabf1a6081964969bb23359b93d6eadbf4739274a77bc3587" - -TD = "${S}/tentative-dist" - -PARALLEL_MAKE = "" - -USE64BIT_x86-64 = "USE_64=1" -USE64BIT_mips64 = "USE_64=1" -USE64BIT_mips64el = "USE_64=1" -USE64BIT ?= "" - -do_compile() { -# sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' -i ${S}/security/coreconf/source.mk - make -C security/nss \ - build_coreconf \ - build_dbm \ - export libs program \ - MOZILLA_CLIENT=1 \ - BUILD_OPT=1 \ - SKIP_SHLIBSIGN=1 \ - OS_TARGET="Linux" \ - OS_TARGET_RELEASE="2.6" \ - OS_TEST="${TARGET_ARCH}" \ - NSPR_INCLUDE_DIR="${STAGING_INCDIR}/mozilla/nspr" \ - NSPR_LIB_DIR="${STAGING_LIBDIR}" \ - SQLITE3_INCLUDE_DIR="${STAGING_INCDIR}" \ - OPTIMIZER="${CFLAGS}" \ - NS_USE_GCC=1 \ - NSS_USE_SYSTEM_SQLITE=1 \ - NSS_ENABLE_ECC=1 \ - DEFAULT_COMPILER="${TARGET_CC}" \ - CC="${CC}" \ - CCC="${CXX}" \ - CXX="${CXX}" \ - RANLIB="${RANLIB}" \ - NATIVE_CC="${BUILD_CC}" \ - NATIVE_FLAGS="${BUILD_CFLAGS}" \ - ${USE64BIT} -} - -do_install() { - make -C security/nss \ - install \ - MOZILLA_CLIENT=1 \ - BUILD_OPT=1 \ - SKIP_SHLIBSIGN=1 \ - OS_TARGET=Linux \ - OS_TARGET_RELEASE="2.6" \ - OS_TEST="${TARGET_ARCH}" \ - NSPR_INCLUDE_DIR="${STAGING_INCDIR}/mozilla/nspr" \ - NSPR_LIB_DIR="${STAGING_LIBDIR}" \ - NS_USE_GCC=1 \ - NSS_USE_SYSTEM_SQLITE=1 \ - NSS_ENABLE_ECC=1 \ - FREEBL_CHILD_BUILD=1 \ - CC="${CC}" \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - ${USE64BIT} - - install -d ${D}/${libdir} - - for shared_lib in ${TD}/${libdir}/*.so* - do -# oe_libinstall -C ${TD}/${libdir} `basename $shared_lib .so` ${D}/${libdir} - cp $shared_lib ${D}/${libdir} -# ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - done - - install -d ${D}/${includedir}/mozilla/nss - install -m 644 -t ${D}/${includedir}/mozilla/nss ${S}/dist/public/nss/* - - for static_lib in ${TD}/${libdir}/*.a - do - oe_libinstall -C ${TD}/${libdir} `basename $static_lib .a` ${D}/${libdir} - done - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/* - do - install -m 755 -t ${D}/${bindir} $binary - done - - install -D ${WORKDIR}/nss.pc.in ${D}${libdir}/pkgconfig/nss.pc - sed -i s:@VERSION@:${PV}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - - sed -i s:/usr/local/bin/perl:${bindir}/perl:g ${D}${bindir}/smime -} - -FILES_SOLIBSDEV := "" -FILES_${PN} += "${base_libdir}/lib*${SOLIBSDEV} ${libdir}/lib*${SOLIBSDEV}" -RDEPENDS_${PN} += "perl"