Patchwork nspr: Integrate version 4.8.9

login
mail settings
Submitter Andrei Gherzan
Date Feb. 7, 2012, 5:33 p.m.
Message ID <1328635982-18444-1-git-send-email-andrei@gherzan.ro>
Download mbox | patch
Permalink /patch/20895/
State New
Headers show

Comments

Andrei Gherzan - Feb. 7, 2012, 5:33 p.m.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
---
 meta/recipes-support/nspr/files/nspr.pc |   11 ++++++++
 meta/recipes-support/nspr/nspr_4.8.9.bb |   40 +++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-support/nspr/files/nspr.pc
 create mode 100644 meta/recipes-support/nspr/nspr_4.8.9.bb
Otavio Salvador - Feb. 7, 2012, 5:35 p.m.
On Tue, Feb 7, 2012 at 15:33, Andrei Gherzan <andrei@gherzan.ro> wrote:

>  meta/recipes-support/nspr/files/nspr.pc |   11 ++++++++
>

Just a cosmetic issue, name the nspr.pc file nspr.pc.in so it is clear that
it is going to be processed.
Phil Blundell - Feb. 7, 2012, 5:40 p.m.
On Tue, 2012-02-07 at 19:33 +0200, Andrei Gherzan wrote:
> +FILES_${PN} = "/usr/lib/*.so"
> +FILES_${PN}-dev = "/usr/bin/* /usr/include/* /usr/share/aclocal/* /usr/lib/pkgconfig/*"
> +FILES_${PN}-dbg = "/usr/bin/.debug/* /usr/lib/.debug/* /usr/src/debug/*"
> +FILE_${PN}-staticdev= "/usr/lib/*.a"

That all looks rather dubious.  The last line surely isn't accomplishing
anything and I suspect the other three are largely wrong/useless as
well.  What problem were you trying to solve by adding those?

p.
Andrei Gherzan - Feb. 7, 2012, 6:14 p.m.
On 02/07/2012 07:40 PM, Phil Blundell wrote:
> On Tue, 2012-02-07 at 19:33 +0200, Andrei Gherzan wrote:
>> +FILES_${PN} = "/usr/lib/*.so"
>> +FILES_${PN}-dev = "/usr/bin/* /usr/include/* /usr/share/aclocal/* /usr/lib/pkgconfig/*"
>> +FILE_${PN}-staticdev= "/usr/lib/*.a"
> That all looks rather dubious.  The last line surely isn't accomplishing
> anything and I suspect the other three are largely wrong/useless as
> well.  What problem were you trying to solve by adding those?
>
> p.
You right. These line are useless here as they end up in the right rpm 
by default. Resending patch...

@g

Patch

diff --git a/meta/recipes-support/nspr/files/nspr.pc b/meta/recipes-support/nspr/files/nspr.pc
new file mode 100644
index 0000000..bbb7b5a
--- /dev/null
+++ b/meta/recipes-support/nspr/files/nspr.pc
@@ -0,0 +1,11 @@ 
+os_libs=-lpthread -ldl
+prefix=OEPREFIX
+exec_prefix=OEEXECPREFIX
+libdir=OELIBDIR
+includedir=OEINCDIR
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: 4.8.9
+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+Cflags: 
diff --git a/meta/recipes-support/nspr/nspr_4.8.9.bb b/meta/recipes-support/nspr/nspr_4.8.9.bb
new file mode 100644
index 0000000..fab8657
--- /dev/null
+++ b/meta/recipes-support/nspr/nspr_4.8.9.bb
@@ -0,0 +1,40 @@ 
+DESCRIPTION = "Netscape Portable Runtime Library"
+HOMEPAGE =  "http://www.mozilla.org/projects/nspr/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+SECTION = "libs/network"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz"
+
+SRC_URI += "file://nspr.pc "
+
+SRC_URI[md5sum] = "60770d45dc08c0f181b22cdfce5be3e8"
+SRC_URI[sha256sum] = "ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce"
+
+S = "${WORKDIR}/nspr-${PV}/mozilla/nsprpub"
+
+inherit autotools 
+
+do_configure() {
+	oe_runconf
+}
+
+do_compile_prepend() {
+	oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export
+}
+
+do_install_append() {
+    install -D ${WORKDIR}/nspr.pc ${D}${libdir}/pkgconfig/nspr.pc
+    sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
+    sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nspr.pc
+    sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nspr.pc
+    sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
+}
+
+FILES_${PN} = "/usr/lib/*.so"
+FILES_${PN}-dev = "/usr/bin/* /usr/include/* /usr/share/aclocal/* /usr/lib/pkgconfig/*"
+FILES_${PN}-dbg = "/usr/bin/.debug/* /usr/lib/.debug/* /usr/src/debug/*"
+FILE_${PN}-staticdev= "/usr/lib/*.a"
+