Re: [PATCH 1/2] nspr: add nspr to pass LSB library test

[Kang Kai <Kai.Kang@windriver.com>]

[-- Attachment #1: Type: text/plain, Size: 6219 bytes --]

On 2011年04月05日 01:51, Saul Wold wrote:
> On 03/28/2011 08:32 PM, Kang Kai wrote:
>> From: Kang Kai<kai.kang@windriver.com>
>>
>> LSB library test will check libnspr4.so which nspr provides.
>> Import from OE, rev 6fe7cef27069415f2eba36bc640cf59013d4979b
>> Update to 4.8.7, drop 99_configure.dpatch, and adjust files for nspr.
>>
>> Signed-off-by: Kang Kai<kai.kang@windriver.com>
>> ---
>> .../mozilla/nspr-4.8.7/30_config_64bits.dpatch | 45 ++++
>> .../mozilla/nspr-4.8.7/30_pkgconfig.dpatch | 37 +++
>> .../mozilla/nspr-4.8.7/81_sonames.dpatch | 233 ++++++++++++++++++++
>> .../mozilla/nspr-4.8.7/unbreak-build.diff | 50 +++++
>> .../recipes-extended/mozilla/nspr-tools-native.inc | 29 +++
>> .../mozilla/nspr-tools-native_4.8.7.bb | 16 ++
>> meta/recipes-extended/mozilla/nspr.inc | 44 ++++
>> meta/recipes-extended/mozilla/nspr_4.8.7.bb | 17 ++
>
>
Hi Saul,

>
> I noticed a problem with the LICENSE field, See further comments below
> This issue is also in the nss recipe.
I will correct it and add exact LICENSE versions.
The license file is just a paragraph explanation of licenses, not the 
LICENSE content itself. And has been insert every file's head. So there 
is no more license files.

Regards,
Kai

>
>
>>
>> diff --git a/meta/recipes-extended/mozilla/nspr-tools-native.inc 
>> b/meta/recipes-extended/mozilla/nspr-tools-native.inc
>> new file mode 100644
>> index 0000000..3575cc1
>> --- /dev/null
>> +++ b/meta/recipes-extended/mozilla/nspr-tools-native.inc
>> @@ -0,0 +1,29 @@
>> +SUMMARY = "Netscape Portable Runtime"
>> +
>> +DESCRIPTION = "\
>> +NSPR provides platform independence for non-GUI operating system \
>> +facilities. These facilities include threads, thread synchronization, \
>> +normal file and network I/O, interval timing and calendar time, basic \
>> +memory management (malloc and free) and shared library linking."
>> +
>> +HOMEPAGE = "https://www.mozilla.org/projects/nspr"
>> +LICENSE = "MPL1.1 | GPL | LGPL"
>> +
> Please be specific about which version of the the GPL and LGPL.
>
>
>> +S = "${WORKDIR}/nspr-${PV}/mozilla/nsprpub"
>> +
>> +inherit native autotools
>> +
>> +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/nspr-${PV}"
>> +
>> +do_compile() {
>> + # Build 'now' and 'nsinstall' only.
>> + oe_runmake -C config now nsinstall
>> +}
>> +
>> +NATIVE_INSTALL_WORKS = "1"
>> +
>> +do_install() {
>> + install -d ${D}${bindir}/nspr-${PV}
>> + install -m 0755 config/now ${D}${bindir}/nspr-${PV}
>> + install -m 0755 config/nsinstall ${D}${bindir}/nspr-${PV}
>> +}
>> diff --git a/meta/recipes-extended/mozilla/nspr-tools-native_4.8.7.bb 
>> b/meta/recipes-extended/mozilla/nspr-tools-native_4.8.7.bb
>> new file mode 100644
>> index 0000000..0cfadcb
>> --- /dev/null
>> +++ b/meta/recipes-extended/mozilla/nspr-tools-native_4.8.7.bb
>> @@ -0,0 +1,16 @@
>> +require nspr-tools-native.inc
>> +
>> +PR = "r0"
>> +
>> +LIC_FILES_CHKSUM = 
>> "file://${S}/pkg/solaris/common_files/copyright;md5=555c634e9953bed3492dd5e6d90cd973"
>> +
> You list 3 LICENSES in the .inc file but only 1 copyright file, are 
> there other files?
>
>> +SRC_URI = "\
>> + 
>> http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive 
>> \
>> + file://30_config_64bits.dpatch;apply=yes \
>> + file://30_pkgconfig.dpatch;apply=yes \
>> + file://81_sonames.dpatch;apply=yes \
>> + file://unbreak-build.diff \
>> + "
>> +
>> +SRC_URI[archive.md5sum] = "97e30989a56ab813453b71261849c200"
>> +SRC_URI[archive.sha256sum] = 
>> "eb9459c31d43d1000fb1304f1e0cedab0bdac3c54c71988259c1ac10c1fe16a3"
>> diff --git a/meta/recipes-extended/mozilla/nspr.inc 
>> b/meta/recipes-extended/mozilla/nspr.inc
>> new file mode 100644
>> index 0000000..e6e6f36
>> --- /dev/null
>> +++ b/meta/recipes-extended/mozilla/nspr.inc
>> @@ -0,0 +1,44 @@
>> +SUMMARY = "Netscape Portable Runtime"
>> +
>> +DESCRIPTION = "\
>> +NSPR provides platform independence for non-GUI operating system \
>> +facilities. These facilities include threads, thread synchronization, \
>> +normal file and network I/O, interval timing and calendar time, basic \
>> +memory management (malloc and free) and shared library linking."
>> +
>> +HOMEPAGE = "https://www.mozilla.org/projects/nspr"
>> +LICENSE = "MPL1.1 | GPL | LGPL"
>
> Please be specific about which version of GPL and LGPL
>> +
>> +PR = "r0"
>> +
>> +DEPENDS = "nspr-tools-native"
>> +
>> +S = "${WORKDIR}/${P}/mozilla/nsprpub"
>> +
>> +inherit autotools
>> +
>> +EXTRA_OECONF = "\
>> + --enable-ipv6 \
>> + --with-mozilla \
>> + --includedir=${includedir}/mozilla/nspr \
>> + "
>> +
>> +TARGET_CC_ARCH += "${LDFLAGS}"
>> +
>> +do_compile_prepend() {
>> + cp ${STAGING_BINDIR_NATIVE}/${P}/now config/now
>> + touch config/now
>> +
>> + cp ${STAGING_BINDIR_NATIVE}/${P}/nsinstall config/nsinstall
>> + touch config/nsinstall
>> +}
>> +
>> +do_install_prepend() {
>> + cp ${STAGING_BINDIR_NATIVE}/${P}/now config/now
>> + touch config/now
>> +
>> + cp ${STAGING_BINDIR_NATIVE}/${P}/nsinstall config/nsinstall
>> + touch config/nsinstall
>> +}
>> +
>> +LEAD_SONAME = "libnspr4.so"
>> diff --git a/meta/recipes-extended/mozilla/nspr_4.8.7.bb 
>> b/meta/recipes-extended/mozilla/nspr_4.8.7.bb
>> new file mode 100644
>> index 0000000..7fb005f
>> --- /dev/null
>> +++ b/meta/recipes-extended/mozilla/nspr_4.8.7.bb
>> @@ -0,0 +1,17 @@
>> +require nspr.inc
>> +
>> +LIC_FILES_CHKSUM = 
>> "file://${S}/pkg/solaris/common_files/copyright;md5=555c634e9953bed3492dd5e6d90cd973"
>> +
>> +SRC_URI = "\
>> + 
>> http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz;name=archive 
>> \
>> + file://30_config_64bits.dpatch;apply=yes \
>> + file://30_pkgconfig.dpatch;apply=yes \
>> + file://81_sonames.dpatch;apply=yes \
>> + file://unbreak-build.diff \
>> + "
>> +
>> +SRC_URI[archive.md5sum] = "7c6e75a0867ce2b9ec62e399a908b5ac"
>> +SRC_URI[archive.sha256sum] = 
>> "58782b11423359f2a247f0217aab6fe041f32984aac1f411da6d43bd34cfd0db"
>> +
>> +FILES_${PN} = "${libdir}/lib*"
>> +FILES_${PN}-dev += "${bindir}/nspr-config"
>


[-- Attachment #2: copyright --]
[-- Type: text/plain, Size: 1723 bytes --]

Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
Use is subject to license terms.

***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1

The contents of this package are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this package except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/

Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.

The Original Code is the Netscape Portable Runtime (NSPR).

The Initial Developer of the Original Code is
Netscape Communications Corporation.
Portions created by the Initial Developer are Copyright (C) 1998-2000
the Initial Developer. All Rights Reserved.

Contributor(s):

Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.

***** END LICENSE BLOCK *****