From patchwork Thu Aug 7 12:53:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Mads_Dor=C3=A9_Hansen?= X-Patchwork-Id: 377843 X-Patchwork-Delegate: kiho@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 7326B1400AF for ; Thu, 7 Aug 2014 22:53:56 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id EA2173F876 for ; Thu, 7 Aug 2014 14:53:54 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from ispc7.dotserv.com (ssl7.dotserv.com [178.20.217.17]) by hugin.dotsrc.org (Postfix) with ESMTPS id 664A63FD91 for ; Thu, 7 Aug 2014 14:53:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ispc7.dotserv.com (Postfix) with ESMTP id 008C0513A15 for ; Thu, 7 Aug 2014 14:53:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ispc7.dotserv.com Received: from ispc7.dotserv.com ([127.0.0.1]) by localhost (ispc7.dotserv.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eGPAHWo4pCUq for ; Thu, 7 Aug 2014 14:53:49 +0200 (CEST) Received: from localhost.localdomain (unknown [195.215.105.114]) (Authenticated sender: dore@madsdore.dk) by ispc7.dotserv.com (Postfix) with ESMTPSA id C2F4D51922C for ; Thu, 7 Aug 2014 14:53:45 +0200 (CEST) From: =?UTF-8?q?Mads=20Dor=C3=A9?= To: dev@oe-lite.org Subject: [base 3/8] nss added, with corrections from previous upstream attempts. Date: Thu, 7 Aug 2014 14:53:40 +0200 Message-Id: <1407416025-2990-3-git-send-email-dore@madsdore.dk> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1407416025-2990-1-git-send-email-dore@madsdore.dk> References: <1407416025-2990-1-git-send-email-dore@madsdore.dk> X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- recipes/nss/nss-3.15.1/cross-config.patch | 24 ++++++++++ recipes/nss/nss-3.15.2/cross-config.patch | 24 ++++++++++ recipes/nss/nss_3.15.1.oe | 78 ++++++++++++++++++++++++++++++ recipes/nss/nss_3.15.1.oe.sig | 2 + recipes/nss/nss_3.15.2.oe | 79 +++++++++++++++++++++++++++++++ recipes/nss/nss_3.15.2.oe.sig | 2 + 6 files changed, 209 insertions(+) create mode 100644 recipes/nss/nss-3.15.1/cross-config.patch create mode 100644 recipes/nss/nss-3.15.2/cross-config.patch create mode 100644 recipes/nss/nss_3.15.1.oe create mode 100644 recipes/nss/nss_3.15.1.oe.sig create mode 100644 recipes/nss/nss_3.15.2.oe create mode 100644 recipes/nss/nss_3.15.2.oe.sig diff --git a/recipes/nss/nss-3.15.1/cross-config.patch b/recipes/nss/nss-3.15.1/cross-config.patch new file mode 100644 index 0000000..ad8959c --- /dev/null +++ b/recipes/nss/nss-3.15.1/cross-config.patch @@ -0,0 +1,24 @@ +--- nss/coreconf/Linux.org.mk 2013-08-06 12:45:47.096832931 +0200 ++++ nss/coreconf/Linux.mk 2013-08-06 12:48:40.744827800 +0200 +@@ -16,9 +16,7 @@ + IMPL_STRATEGY = _PTH + endif + +-CC = gcc +-CCC = g++ +-RANLIB = ranlib ++CCC = $(CPP) + + DEFAULT_COMPILER = gcc + +--- nss/coreconf/arch.org.mk 2013-08-06 14:10:25.528682880 +0200 ++++ nss/coreconf/arch.mk 2013-08-06 14:11:41.140680646 +0200 +@@ -302,7 +302,7 @@ + # IMPL_STRATEGY may be defined too. + # + +-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ ++OBJDIR_NAME = obj + + ifeq (,$(filter-out WIN%,$(OS_TARGET))) + ifndef BUILD_OPT diff --git a/recipes/nss/nss-3.15.2/cross-config.patch b/recipes/nss/nss-3.15.2/cross-config.patch new file mode 100644 index 0000000..e89d2fa --- /dev/null +++ b/recipes/nss/nss-3.15.2/cross-config.patch @@ -0,0 +1,24 @@ +--- nss/coreconf/Linux.org.mk 2013-08-06 12:45:47.096832931 +0200 ++++ nss/coreconf/Linux.mk 2013-08-06 12:48:40.744827800 +0200 +@@ -16,9 +16,7 @@ + IMPL_STRATEGY = _PTH + endif + +-CC = gcc +-CCC = g++ +-RANLIB = ranlib ++CCC = $(CXX) + + DEFAULT_COMPILER = gcc + +--- nss/coreconf/arch.org.mk 2013-08-06 14:10:25.528682880 +0200 ++++ nss/coreconf/arch.mk 2013-08-06 14:11:41.140680646 +0200 +@@ -302,7 +302,7 @@ + # IMPL_STRATEGY may be defined too. + # + +-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ ++OBJDIR_NAME = obj + + ifeq (,$(filter-out WIN%,$(OS_TARGET))) + ifndef BUILD_OPT diff --git a/recipes/nss/nss_3.15.1.oe b/recipes/nss/nss_3.15.1.oe new file mode 100644 index 0000000..d9c718c --- /dev/null +++ b/recipes/nss/nss_3.15.1.oe @@ -0,0 +1,78 @@ +SUMMARY = "Network Security Services - provides cross platform security support" +DESCRIPTION = """ +Network Security Services (NSS) comprises a set of libraries designed to support +cross-platform development of security-enabled client and server applications +with optional support for hardware SSL acceleration on the server side and +hardware smart cards on the client side. +""" +LICENSE = "MPL" +HOMEPAGE = "https://developer.mozilla.org/en/docs/NSS" + +RECIPE_TYPE = "machine sdk" + +SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${PN}-${PV}.tar.gz" + +SRC_URI += "http://www.linuxfromscratch.org/patches/blfs/svn/nss-3.15.1-standalone-2.patch;striplevel=2" + +SRC_URI += """ + file://cross-config.patch +""" + +inherit c make library pkgconfig + +# According to http://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html +PARALLEL_MAKE = "" + +DEPENDS += "nspr nspr-dev libz libdl libpthread librt" + +S = "${SRCDIR}/${PN}-${PV}/${PN}" + +EXTRA_OEMAKE_COMPILE = " \ + BUILD_OPT=1 \ + NSPR_INCLUDE_DIR=${STAGE_DIR}/${includedir} \ + USE_SYSTEM_ZLIB=1 \ + ZLIB_LIBS=-lz \ +" + +do_install () { + install -d ${D}${bindir} + install -m 755 ${S}/../dist/obj/bin/* ${D}${bindir} + + install -d ${D}${libdir} + install -m 655 ${S}/../dist/obj/lib/*.a ${D}/${libdir} + + install -d ${D}${sharedlibdir} + cd ${S}/../dist/obj/lib + for solib in *.so + do + install -m 755 ${S}/../dist/obj/lib/$solib \ + ${D}/${sharedlibdir}/$solib + done + + install -d ${D}${includedir}/nss + install -m 755 ${S}/../dist/public/nss/* ${D}${includedir}/nss + + install -d ${D}${sharedlibdir}/pkgconfig + install -m 644 ${S}/../dist/obj/lib/pkgconfig/* \ + ${D}/${sharedlibdir}/pkgconfig +} + +PACKAGES =+ " ${PN}-utils ${PN}-utils-dbg " +PACKAGES =+ " ${PN}-certutil " +PACKAGES =+ " ${PN}-nss-config " +PACKAGES =+ " ${PN}-pk12util " + +# no *so.* files are created so use *.so +# Accomplish by switching SOLIBS and SOLIBSDEV +SOLIBSDEV = ".so.*" +SOLIBS = ".so" +FILES_${PN}-utils = "${bindir}/*" +FILES_${PN}-utils-dbg = "${bindir}/.debug/*" +FILES_${PN}-certutil = "${bindir}/certutil" +FILES_${PN}-nss-config = "${bindir}/nss-config" +FILES_${PN}-pk12util = "${bindir}/pk12util" + +DEPENDLIBS = "nspr libz libdl libpthread librt" +DEPENDS_${PN} += " ${DEPENDLIBS} " +RDEPENDS_${PN} += " ${DEPENDLIBS} " +RDEPENDS_${PN}-utils += "${DEPENDLIBS} libnss" diff --git a/recipes/nss/nss_3.15.1.oe.sig b/recipes/nss/nss_3.15.1.oe.sig new file mode 100644 index 0000000..cc4dfb9 --- /dev/null +++ b/recipes/nss/nss_3.15.1.oe.sig @@ -0,0 +1,2 @@ +767a423db66948c55c04c2a31a9626b7a95040e9 nss-3.15.1-standalone-2.patch +1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0 nss-3.15.1.tar.gz diff --git a/recipes/nss/nss_3.15.2.oe b/recipes/nss/nss_3.15.2.oe new file mode 100644 index 0000000..1b142b8 --- /dev/null +++ b/recipes/nss/nss_3.15.2.oe @@ -0,0 +1,79 @@ +SUMMARY = "Network Security Services - provides cross platform security support" +DESCRIPTION = """ +Network Security Services (NSS) comprises a set of libraries designed to support +cross-platform development of security-enabled client and server applications +with optional support for hardware SSL acceleration on the server side and +hardware smart cards on the client side. +""" +LICENSE = "MPL" +HOMEPAGE = "https://developer.mozilla.org/en/docs/NSS" + +RECIPE_TYPE = "machine sdk" + +SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_2_RTM/src/${PN}-${PV}.tar.gz" + +SRC_URI += "http://www.linuxfromscratch.org/patches/downloads/nss/nss-3.15.2-standalone-1.patch;striplevel=2" + +SRC_URI += """ + file://cross-config.patch +""" + +inherit c make library pkgconfig + +# According to http://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html +PARALLEL_MAKE = "" + +DEPENDS += "nspr nspr-dev libz libdl libpthread librt" + +S = "${SRCDIR}/${PN}-${PV}/${PN}" + +EXTRA_OEMAKE_COMPILE = " \ + BUILD_OPT=1 \ + NSPR_INCLUDE_DIR=${STAGE_DIR}${includedir} \ + NSPR_LIB_DIR=${HOST_SYSROOT}${libdir} \ + USE_SYSTEM_ZLIB=1 \ + ZLIB_LIBS=-lz \ +" + +do_install () { + install -d ${D}${bindir} + install -m 755 ${S}/../dist/obj/bin/* ${D}${bindir} + + install -d ${D}${libdir} + install -m 655 ${S}/../dist/obj/lib/*.a ${D}/${libdir} + + install -d ${D}${sharedlibdir} + cd ${S}/../dist/obj/lib + for solib in *.so + do + install -m 755 ${S}/../dist/obj/lib/$solib \ + ${D}/${sharedlibdir}/$solib + done + + install -d ${D}${includedir}/nss + install -m 755 ${S}/../dist/public/nss/* ${D}${includedir}/nss + + install -d ${D}${sharedlibdir}/pkgconfig + install -m 644 ${S}/../dist/obj/lib/pkgconfig/* \ + ${D}/${sharedlibdir}/pkgconfig +} + +PACKAGES =+ " ${PN}-utils ${PN}-utils-dbg " +PACKAGES =+ " ${PN}-certutil " +PACKAGES =+ " ${PN}-nss-config " +PACKAGES =+ " ${PN}-pk12util " + +# no *so.* files are created so use *.so +# Accomplish by switching SOLIBS and SOLIBSDEV +SOLIBSDEV = ".so.*" +SOLIBS = ".so" +FILES_${PN}-utils = "${bindir}/*" +FILES_${PN}-utils-dbg = "${bindir}/.debug/*" +FILES_${PN}-certutil = "${bindir}/certutil" +FILES_${PN}-nss-config = "${bindir}/nss-config" +FILES_${PN}-pk12util = "${bindir}/pk12util" + +DEPENDLIBS = "nspr libz libdl libpthread librt" +DEPENDS_${PN} += " ${DEPENDLIBS} " +RDEPENDS_${PN} += " ${DEPENDLIBS} " +RDEPENDS_${PN}-utils += "${DEPENDLIBS} libnss" diff --git a/recipes/nss/nss_3.15.2.oe.sig b/recipes/nss/nss_3.15.2.oe.sig new file mode 100644 index 0000000..cb04120 --- /dev/null +++ b/recipes/nss/nss_3.15.2.oe.sig @@ -0,0 +1,2 @@ +767a423db66948c55c04c2a31a9626b7a95040e9 nss-3.15.2-standalone-1.patch +2d900c296bf11deabbf833ebd6ecdea549c97a5f nss-3.15.2.tar.gz