From 622ad8482b55957f4a08eadf0131b0eb86d1886b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 9 Sep 2014 16:15:11 -0700 Subject: nspr: Upgrade to 4.10.7 Remove patch that was directly modifing the configure script since we can now use autoreconf to configure. This also allowed for the removal of the do_configure() functions. Added patch to remove an undefined ${srcdir}. Signed-off-by: Saul Wold --- .../nspr/nspr/fix-build-on-x86_64.patch | 31 ++-- .../nspr/remove-srcdir-from-configure-in.patch | 19 +++ .../nspr/nspr/trickly-fix-build-on-x86_64.patch | 62 ------- meta/recipes-support/nspr/nspr_4.10.3.bb | 179 --------------------- meta/recipes-support/nspr/nspr_4.10.7.bb | 172 ++++++++++++++++++++ 5 files changed, 207 insertions(+), 256 deletions(-) create mode 100644 meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch delete mode 100644 meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch delete mode 100644 meta/recipes-support/nspr/nspr_4.10.3.bb create mode 100644 meta/recipes-support/nspr/nspr_4.10.7.bb (limited to 'meta/recipes-support/nspr') diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch index a6fa1ea607..c2b7258e50 100644 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -11,23 +11,27 @@ Upstream-Status: Pending configure.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/configure.in b/configure.in -index 39c96a3..99a03ac 100644 ---- a/configure.in -+++ b/configure.in -@@ -1778,24 +1778,24 @@ tools are selected during the Xcode/Developer Tools installation.]) +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve PR_MD_ASFILES=os_Linux_ia64.s ;; x86_64) - if test -n "$USE_64"; then - PR_MD_ASFILES=os_Linux_x86_64.s -- else -+ if test -n "$USE_N32"; then - AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86.s - CC="$CC -m32" - CXX="$CXX -m32" -+ else +- elif test -n "$USE_X32"; then ++ if test -n "$USE_X32"; then ++ AC_DEFINE(i386) + PR_MD_ASFILES=os_Linux_x86_64.s + CC="$CC -mx32" + CXX="$CXX -mx32" + else +- AC_DEFINE(i386) +- PR_MD_ASFILES=os_Linux_x86.s +- CC="$CC -m32" +- CXX="$CXX -m32" + PR_MD_ASFILES=os_Linux_x86_64.s fi ;; @@ -46,6 +50,3 @@ index 39c96a3..99a03ac 100644 fi ;; m68k) --- -1.7.1 - diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch new file mode 100644 index 0000000000..bde715c5dc --- /dev/null +++ b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch @@ -0,0 +1,19 @@ +the $srcdir is not defined at the time of gnu-configurize. + +Upstream-Status: Inappropriate [OE-Core specific] + +Signed-off-by: Saul Wold + +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -8,7 +8,7 @@ AC_PREREQ(2.61) + AC_INIT + AC_CONFIG_SRCDIR([pr/include/nspr.h]) + +-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) ++AC_CONFIG_AUX_DIR(build/autoconf) + AC_CANONICAL_TARGET + + dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch deleted file mode 100644 index 8ca51e4d1f..0000000000 --- a/meta/recipes-support/nspr/nspr/trickly-fix-build-on-x86_64.patch +++ /dev/null @@ -1,62 +0,0 @@ -trickily fix build failure on x86_64 - -It seems that we can not run the 'autoreconf -f -i' for the nspr, I met -several strange problems while trying to do that, and the previous -author seemed had noticed this, so he wrote: - -do_configure() { - oe_runconf -} - -to avoid running the "autoreconf". But we must modify configure.in to -fix the build failure on x86_64, so both modify configure and -configure.in, once the "autoreconf" can work correctly, we can remove -this patch. - -Signed-off-by: Robert Yang - -Upstream-Status: Inappropriate [configuration] ---- - configure | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -4366,9 +4366,7 @@ EOF - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- else -+ if test -n "$USE_N32"; then - cat >> confdefs.h <<\EOF - #define i386 1 - EOF -@@ -4376,17 +4374,19 @@ EOF - PR_MD_ASFILES=os_Linux_x86.s - CC="$CC -m32" - CXX="$CXX -m32" -+ else -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - m68k) --- -1.7.1 - diff --git a/meta/recipes-support/nspr/nspr_4.10.3.bb b/meta/recipes-support/nspr/nspr_4.10.3.bb deleted file mode 100644 index 60e1bfa7b1..0000000000 --- a/meta/recipes-support/nspr/nspr_4.10.3.bb +++ /dev/null @@ -1,179 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://trickly-fix-build-on-x86_64.patch \ - file://nspr-CVE-2014-1545.patch \ - " - -SRC_URI += "file://nspr.pc.in" - -SRC_URI[md5sum] = "bf298e874cf454a3c2f8fe7e671c5d2e" -SRC_URI[sha256sum] = "f25779b1a665dab0090b9c977dc6c29a63320f442956ed78629b66b405cb01e5" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = "runtests.pl \ - runtests.sh \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools-brokensep - -do_configure() { - gnu-configize --force - mv config.sub config.guess build/autoconf - oe_runconf -} - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${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 - cd ${S}/pr/tests - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " -FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/nspr/nspr_4.10.7.bb b/meta/recipes-support/nspr/nspr_4.10.7.bb new file mode 100644 index 0000000000..69e9dfa6a3 --- /dev/null +++ b/meta/recipes-support/nspr/nspr_4.10.7.bb @@ -0,0 +1,172 @@ +SUMMARY = "Netscape Portable Runtime Library" +HOMEPAGE = "http://www.mozilla.org/projects/nspr/" +LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" +LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ + file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" +SECTION = "libs/network" + +SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ + file://remove-rpath-from-tests.patch \ + file://fix-build-on-x86_64.patch \ + file://remove-srcdir-from-configure-in.patch \ + " + +SRC_URI += "file://nspr.pc.in" + +SRC_URI[md5sum] = "6e06919e4b56efed501e05d8b45ec10e" +SRC_URI[sha256sum] = "389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938" + +S = "${WORKDIR}/nspr-${PV}/nspr" + +RDEPENDS_${PN}-dev += "perl" +TARGET_CC_ARCH += "${LDFLAGS}" + +TESTS = "runtests.pl \ + runtests.sh \ + accept \ + acceptread \ + acceptreademu \ + affinity \ + alarm \ + anonfm \ + atomic \ + attach \ + bigfile \ + cleanup \ + cltsrv \ + concur \ + cvar \ + cvar2 \ + dlltest \ + dtoa \ + errcodes \ + exit \ + fdcach \ + fileio \ + foreign \ + formattm \ + fsync \ + gethost \ + getproto \ + i2l \ + initclk \ + inrval \ + instrumt \ + intrio \ + intrupt \ + io_timeout \ + ioconthr \ + join \ + joinkk \ + joinku \ + joinuk \ + joinuu \ + layer \ + lazyinit \ + libfilename \ + lltest \ + lock \ + lockfile \ + logfile \ + logger \ + many_cv \ + multiwait \ + nameshm1 \ + nblayer \ + nonblock \ + ntioto \ + ntoh \ + op_2long \ + op_excl \ + op_filnf \ + op_filok \ + op_nofil \ + parent \ + parsetm \ + peek \ + perf \ + pipeping \ + pipeping2 \ + pipeself \ + poll_nm \ + poll_to \ + pollable \ + prftest \ + primblok \ + provider \ + prpollml \ + ranfile \ + randseed \ + reinit \ + rwlocktest \ + sel_spd \ + selct_er \ + selct_nm \ + selct_to \ + selintr \ + sema \ + semaerr \ + semaping \ + sendzlf \ + server_test \ + servr_kk \ + servr_uk \ + servr_ku \ + servr_uu \ + short_thread \ + sigpipe \ + socket \ + sockopt \ + sockping \ + sprintf \ + stack \ + stdio \ + str2addr \ + strod \ + switch \ + system \ + testbit \ + testfile \ + threads \ + timemac \ + timetest \ + tpd \ + udpsrv \ + vercheck \ + version \ + writev \ + xnotify \ + zerolen" + +inherit autotools-brokensep + +do_compile_prepend() { + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export +} + +do_compile_append() { + oe_runmake -C pr/tests +} + +do_install_append() { + install -D ${WORKDIR}/nspr.pc.in ${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 + cd ${S}/pr/tests + mkdir -p ${D}${libdir}/nspr/tests + install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests + + # delete compile-et.pl and perr.properties from ${bindir} because these are + # only used to generate prerr.c and prerr.h files from prerr.et at compile + # time + rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties +} + +FILES_${PN} = "${libdir}/lib*.so" +FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ + ${includedir}/* ${datadir}/aclocal/* " +FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg