From 905dec2704b7230d4a7dce5cb978624320ece8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mads=20Dor=C3=A9?= <dore@madsdore.dk>
Date: Tue, 16 Dec 2014 16:09:29 +0100
Subject: [PATCH] Split into nspr.inc and package_qa executed.

---
 recipes/nspr/nspr.inc       | 63 +++++++++++++++++++++++++++++++++++++
 recipes/nspr/nspr_4.10.6.oe |  6 ++++
 recipes/nspr/nspr_4.10.oe   | 58 +---------------------------------
 3 files changed, 70 insertions(+), 57 deletions(-)
 create mode 100644 recipes/nspr/nspr.inc
 create mode 100644 recipes/nspr/nspr_4.10.6.oe

diff --git a/recipes/nspr/nspr.inc b/recipes/nspr/nspr.inc
new file mode 100644
index 000000000..f44b4672e
--- /dev/null
+++ b/recipes/nspr/nspr.inc
@@ -0,0 +1,63 @@
+SUMMARY = "Netscape portable runtime, or NSPR, a platform abstraction library"
+DESCRIPTION = """
+NSPR, a platform abstraction library, makes all operating systems it supports
+appear the same to (for example) Mozilla-style web-browsers. NSPR provides platform
+independence for non-GUI operating system facilities
+"""
+HOMEPAGE = "https://developer.mozilla.org/docs/NSPR"
+LICENSE = "MPL"
+
+RECIPE_TYPES = "machine native"
+
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${PN}-${PV}.tar.gz"
+SRC_URI:>machine += " file://nsinstall.patch"
+
+inherit pkgconfig autotools auto-package-libs auto-package-utils
+
+DEPENDS += "libstdc++ libdl librt libpthread "
+DEPENDS:>machine += " native:nspr-nsinstall"
+
+EXTRA_OECONF:>machine = ""
+
+EXTRA_OECONF += " \
+	--enable-mdupdate \
+"
+
+S = "${SRCDIR}/${PN}-${PV}/${PN}"
+
+NSINSTALL_POST_FUNC = ""
+NSINSTALL_POST_FUNC:native = "do_install_nsinstall"
+do_install[postfuncs] += "${NSINSTALL_POST_FUNC}"
+do_install_nsinstall() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/config/nsinstall ${D}/${bindir}
+}
+
+AUTO_PACKAGE_UTILS = "nspr-config nsinstall"
+
+FILES_${PN}-nspr-config += " ${bindir}/compile-et.pl "
+FILES_${PN}-nspr-config += " ${bindir}/prerr.properties "
+
+AUTO_PACKAGE_UTILS_RDEPENDS += "${PN}"
+
+# This package only creates .so files. These are
+# what we need in the 'main package'
+SOLIBS = ".so"
+SOLIBSDEV = ".so.*"
+
+AUTO_PACKAGE_LIBS = "nspr4 plc4 plds4"
+AUTO_PACKAGE_LIB_RDEPENDS = "libpthread libdl librt libc"
+AUTO_PACKAGE_LIB_DEPENDS  = "libpthread libdl librt libc"
+
+RDEPENDS_${PN} += "libnspr4 libplc4 libplds4 ${AUTO_PACKAGE_LIB_RDEPENDS}"
+DEPENDS_${PN} += "${AUTO_PACKAGE_LIB_DEPENDS}"
+
+DEPENDS_${PN}-libplc4   += "libnspr4"
+RDEPENDS_${PN}-libplc4  += "libnspr4 libc"
+
+DEPENDS_${PN}-libplds4  += "libnspr4 libc"
+RDEPENDS_${PN}-libplds4 += "libnspr4 libc"
+
+DEPENDS_${PN}-libnspr4  += "${AUTO_PACKAGE_LIB_DEPENDS}"
+RDEPENDS_${PN}-libnspr4 += "${AUTO_PACKAGE_LIB_RDEPENDS}"
+
diff --git a/recipes/nspr/nspr_4.10.6.oe b/recipes/nspr/nspr_4.10.6.oe
new file mode 100644
index 000000000..9b951f325
--- /dev/null
+++ b/recipes/nspr/nspr_4.10.6.oe
@@ -0,0 +1,6 @@
+require nspr.inc
+
+EXTRA_OECONF += " \
+	--enable-64bit \
+"
+
diff --git a/recipes/nspr/nspr_4.10.oe b/recipes/nspr/nspr_4.10.oe
index 3cf159d11..c7d46eb62 100644
--- a/recipes/nspr/nspr_4.10.oe
+++ b/recipes/nspr/nspr_4.10.oe
@@ -1,58 +1,2 @@
-SUMMARY = "Netscape portable runtime, or NSPR, a platform abstraction library"
-DESCRIPTION = """
-NSPR, a platform abstraction library, makes all operating systems it supports
-appear the same to (for example) Mozilla-style web-browsers. NSPR provides platform
-independence for non-GUI operating system facilities
-"""
-HOMEPAGE = "https://developer.mozilla.org/docs/NSPR"
-LICENSE = "MPL"
+require nspr.inc
 
-RECIPE_TYPES = "machine native"
-
-SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10/src/${PN}-${PV}.tar.gz"
-SRC_URI:>machine += " file://nsinstall.patch"
-
-inherit pkgconfig autotools auto-package-libs auto-package-utils
-
-DEPENDS += "libstdc++ libdl librt libpthread "
-DEPENDS:>machine += " native:nspr-nsinstall"
-
-EXTRA_OECONF:>machine = ""
-
-EXTRA_OECONF += " \
-	--enable-mdupdate \
-"
-
-S = "${SRCDIR}/${PN}-${PV}/${PN}"
-
-NSINSTALL_POST_FUNC = ""
-NSINSTALL_POST_FUNC:native = "do_install_nsinstall"
-do_install[postfuncs] += "${NSINSTALL_POST_FUNC}"
-do_install_nsinstall() {
-	install -d ${D}/${bindir}
-	install -m 0755 ${S}/config/nsinstall ${D}/${bindir}
-}
-
-
-
-AUTO_PACKAGE_UTILS = "nspr-config nsinstall"
-
-FILES_${PN}-nspr-config += " ${bindir}/compile-et.pl "
-FILES_${PN}-nspr-config += " ${bindir}/prerr.properties "
-
-AUTO_PACKAGE_UTILS_RDEPENDS += "${PN}"
-
-# This package only creates .so files. These are
-# what we need in the 'main package'
-SOLIBS = ".so"
-SOLIBSDEV = ".so.*"
-
-AUTO_PACKAGE_LIBS = "nspr4 plc4 plds4"
-AUTO_PACKAGE_LIB_RDEPENDS = "libpthread libdl librt libc"
-
-RDEPENDS_${PN} = "libnspr4 libplc4 libplds4"
-
-RDEPENDS_${PN}-plc4 = "libnspr4"
-RDEPENDS_${PN}-plds4 = "libnspr4"
-
-DEPENDS_${PN} = "${LIBS_AUTO_PACKAGES}"