ERROR: firefox-45.6.0esr-r0 do_patch: Command Error: 'quilt --quiltrc ../build/tmp/sysroots/x86_64-linux/etc/quiltrc push' exited with 0 Output: Applying patch 0002-use-pkg-config-to-find-nspr.patch patching file configure Hunk #1 FAILED at 15153. 1 out of 1 hunk FAILED -- rejects in file configure Patch 0002-use-pkg-config-to-find-nspr.patch does not apply (enforce with -f) ERROR: firefox-45.6.0esr-r0 do_patch: Function failed: patch_do_patch
On Wed, Jan 11, 2017 at 10:01 AM, Andreas Müller < [email protected]> wrote: > On Wed, Jan 11, 2017 at 12:57 PM, Fabio Berton > <[email protected]> wrote: > > This patch doesn't apply. > > > > On Tue, Jan 10, 2017 at 4:48 PM, Andreas Müller < > > [email protected]> wrote: > > > >> nspr-config adds path /usr/include > >> > >> which causes lots of > >> > >> | cc1plus: warning: include location "/usr/include" is unsafe for > >> cross-compilation [-Wpoison-system-directories] > >> > >> and finally fails with > >> > >> | In file included from /usr/include/sys/syscall.h:31:0, > >> | from <workdir>/cortexa7hf-neon- > >> vfpv4-angstrom-linux-gnueabi/firefox/45.5.1esr-r0/firefox- > >> 45.5.1esr/firefox-build-dir/dist/system_wrappers/sys/syscall.h:4, > >> | from <workdir>/cortexa7hf-neon- > >> vfpv4-angstrom-linux-gnueabi/firefox/45.5.1esr-r0/firefox- > >> 45.5.1esr/memory/mozjemalloc/jemalloc.c:397: > >> | <workdir>/cortexa7hf-neon-vfpv4-angstrom-linux-gnueabi/ > >> firefox/45.5.1esr-r0/firefox-45.5.1esr/memory/mozjemalloc/jemalloc.c: > In > >> function '_mmap': > >> | <workdir>/cortexa7hf-neon-vfpv4-angstrom-linux-gnueabi/ > >> firefox/45.5.1esr-r0/firefox-45.5.1esr/memory/mozjemalloc/ > jemalloc.c:417:26: > >> error: '__NR_mmap2' undeclared (first use in this function) > >> | return (void *) syscall(SYS_mmap2, addr, length, prot, flags, > >> > >> Signed-off-by: Andreas Müller <[email protected]> > >> --- > >> .../firefox/0002-use-pkg-config-to-find-nspr.patch | 37 > >> ++++++++++++++++++++++ > >> recipes-mozilla/firefox/firefox_45.6.0esr.bb | 1 + > >> 2 files changed, 38 insertions(+) > >> create mode 100644 recipes-mozilla/firefox/ > firefox/0002-use-pkg-config- > >> to-find-nspr.patch > >> > >> diff --git a/recipes-mozilla/firefox/firefox/0002-use-pkg-config- > to-find-nspr.patch > >> b/recipes-mozilla/firefox/firefox/0002-use-pkg-config- > to-find-nspr.patch > >> new file mode 100644 > >> index 0000000..d97570b > >> --- /dev/null > >> +++ b/recipes-mozilla/firefox/firefox/0002-use-pkg-config- > >> to-find-nspr.patch > >> @@ -0,0 +1,37 @@ > >> +From cdb21594b814af82c4128ccd1179267de2e0e780 Mon Sep 17 00:00:00 2001 > >> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> > >> +Date: Wed, 14 Dec 2016 22:57:55 +0100 > >> +Subject: [PATCH] use pkg-config to find nspr > >> +MIME-Version: 1.0 > >> +Content-Type: text/plain; charset=UTF-8 > >> +Content-Transfer-Encoding: 8bit > >> + > >> +Upstream-Status: Inappropriate [embedded specific] > >> + > >> +Signed-off-by: Andreas Müller <[email protected]> > >> +--- > >> + configure | 4 +++- > >> + 1 file changed, 3 insertions(+), 1 deletion(-) > >> + > >> +diff --git a/configure b/configure > >> +index 16133bf..806896a 100755 > >> +--- a/configure > >> ++++ b/configure > >> +@@ -15153,10 +15153,13 @@ fi > >> + echo "configure:15154: checking for NSPR - version >= > $min_nspr_version" > >> >&5 > >> + > >> + no_nspr="" > >> ++ NSPR_CONFIG="pkg-config nspr" > >> ++ nspr_config_args= > >> + if test "$NSPR_CONFIG" != "no"; then > >> + NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags` > >> + NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs` > >> +- NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args > >> --version` > >> ++ NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args > >> --modversion` > >> ++ echo -n "$NSPR_VERSION_STRING... " > >> + elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then > >> + NSPR_CFLAGS="${NO_NSPR_CONFIG_SYSTEM_CFLAGS}" > >> + NSPR_LIBS="${NO_NSPR_CONFIG_SYSTEM_LDFLAGS}" > >> +-- > >> +2.5.5 > >> + > >> diff --git a/recipes-mozilla/firefox/firefox_45.6.0esr.bb > >> b/recipes-mozilla/firefox/firefox_45.6.0esr.bb > >> index 6ca6633..a4ae32f 100644 > >> --- a/recipes-mozilla/firefox/firefox_45.6.0esr.bb > >> +++ b/recipes-mozilla/firefox/firefox_45.6.0esr.bb > >> @@ -40,6 +40,7 @@ SRC_URI = "https://archive.mozilla.org/ > >> pub/firefox/releases/${PV}/source/firefox > >> file://Fix-firefox-install-dir.patch \ > >> file://fixes/Correct-the-source-to-be-compatible-with- > gcc6-by-pre.patch > >> \ > >> file://0001-use-pkg-config-to-find-nss.patch \ > >> + file://0002-use-pkg-config-to-find-nspr.patch \ > >> " > >> > >> SRC_URI[archive.md5sum] = "ee3cf2401a5716cebacaae5fb70d133f" > >> -- > >> 2.5.5 > >> > >> -- > ??? - will check and sen V3 > > Andreas > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
