firefox: fix configure with oe-core master - there is no nss-config
PATCH v2 1/3 firefox: fix configure with oe-core master - there is no nss-config
| configure:15633: checking for NSS - version >= 3.21.3
| configure: error: you don't have NSS installed or your version is too old
--- .../firefox/0001-use-pkg-config-to-find-nss.patch | 47 ++++++++++++++++++++++ recipes-mozilla/firefox/firefox_45.6.0esr.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 recipes-mozilla/firefox/firefox/0001-use-pkg-config-to-find-nss.patch
recipes-mozilla/firefox/firefox/0001-use-pkg-config-to-find-nss.patch new file +47 -0
@@ -0,0 +1,47 @@ +From f5533e4f2ac147256f7c41166ae1ef98f41d7f39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Wed, 14 Dec 2016 21:37:03 +0100 +Subject: [PATCH] use pkg-config to find nss +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 | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index c27acdd..16133bf 100755 +--- a/configure ++++ b/configure +@@ -15630,7 +15630,8 @@ fi + min_nss_version=3.21.3 + echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6 + echo "configure:15633: checking for NSS - version >= $min_nss_version" >&5 +- ++ NSS_CONFIG="pkg-config nss" ++ nss_config_args= + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" +@@ -15638,11 +15639,11 @@ echo "configure:15633: checking for NSS - version >= $min_nss_version" >&5 + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + +- nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ ++ nss_config_major_version=`$NSS_CONFIG $nss_config_args --modversion | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\1/'` +- nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ ++ nss_config_minor_version=`$NSS_CONFIG $nss_config_args --modversion | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\2/'` +- nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ ++ nss_config_micro_version=`$NSS_CONFIG $nss_config_args --modversion | \ + sed 's/\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\{0,1\}/\4/'` + if test -z "$nss_config_micro_version"; then + nss_config_micro_version="0" +-- +2.5.5 +
recipes-mozilla/firefox/firefox_45.6.0esr.bb +1 -0
@@ -39,6 +39,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}/source/firefox file://debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch \ 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 \ " SRC_URI[archive.md5sum] = "ee3cf2401a5716cebacaae5fb70d133f"
Signature · 1 line
2.5.5
PATCH v2 2/3 firefox: use pkg-config to find nspr
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,
--- .../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
recipes-mozilla/firefox/firefox/0002-use-pkg-config-to-find-nspr.patch new file +37 -0
@@ -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 +
recipes-mozilla/firefox/firefox_45.6.0esr.bb +1 -0
@@ -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"
Signature · 1 line
2.5.5
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
This patch doesn't apply.
Quoted 105 lines · Andreas Müller
nspr-config adds path
/usr/includewhich 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
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +0
-0to-find-nspr.patch
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +21
-0@@ -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"Quoted 1 line
&5
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +16
-2+ + 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 +recipes-mozilla/firefox/firefox_45.6.0esr.bb +0
-0@@ -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--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
Quoted 100 lines · Fabio Berton
This patch doesn't apply.
Quoted 95 lines · Andreas Müller
nspr-config adds path
/usr/includewhich 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
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +0
-0to-find-nspr.patch
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +21
-0@@ -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"Quoted 1 line
&5
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +16
-2+ + 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 +recipes-mozilla/firefox/firefox_45.6.0esr.bb +0
-0@@ -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 \ "
Quoted 5 lines
Quoted 5 lines
SRC_URI[archive.md5sum] = "
ee3cf2401a5716cebacaae5fb70d133f"
--
2.5.5--
??? - will check and sen V3
Andreas
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
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
Quoted 123 lines · Andreas Müller
Quoted 23 lines · Fabio Berton
This patch doesn't apply.
Quoted 18 lines · Andreas Müller
nspr-config adds path
/usr/includewhich 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
Quoted 3 lines
Quoted 3 lines
function '
_mmap':
| <workdir>/cortexa7hf-neon-vfpv4-angstrom-linux-gnueabi/ firefox/45.5.1esr-r0/firefox-45.5.1esr/memory/mozjemalloc/jemalloc.c:417:26:
Quoted 10 lines
Quoted 10 lines
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-
Quoted 3 lines
Review
Quoted 3 lines
to-find-nspr.patch
(quoted diff) +0
-0to-find-nspr.patch
Quoted 1 line
Quoted 1 line
b/recipes-mozilla/firefox/firefox/0002-use-pkg-config-
to-find-nspr.patch
Quoted 19 lines
Quoted 19 lines
new file mode 100644
index 0000000..d97570brecipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +0
-0to-find-nspr.patch
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +13
-0@@ -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 +++-Quoted 8 lines
recipes-mozilla/firefox/firefox/0002-use-pkg-config- line 21
Quoted 8 lines
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +8
-0+ 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"
Quoted 20 lines
Quoted 20 lines
Quoted 1 line
&5
recipes-mozilla/firefox/firefox/0002-use-pkg-config- new file +16
-2+ + 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 +(quoted diff) +0
-0Quoted 8 lines
Quoted 8 lines
b/recipes-mozilla/firefox/firefox_45.6.0esr.bb
index 6ca6633..a4ae32f 100644recipes-mozilla/firefox/firefox_45.6.0esr.bb +0
-0@@ -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
Quoted 10 lines
Quoted 10 lines
\ 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
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
Quoted 10 lines · Fabio Berton
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-r0do_patch: Function failed:patch_do_patch
Ahh: The patch in the patch does not apply. I tested that before sending and tested it again few seconds ago. It is possible that - since I haven't latest oe-core (or bitbake?) - you have different result.
As far as I can remember there was an announcement by Alexander Kanavin to change patching to more restrictive mode so that the full three lines before/after change must match. Will redo patch creation based on firefox 45.6..
Andreas
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
I'm testing with master branch for all layers.
Quoted 31 lines · Andreas Müller
Quoted 2 lines · Fabio Berton
ERROR: firefox-45.6.0esr-r0
do_patch: Command Error: 'quilt --quiltrc ../build/tmp/sysroots/x86_64-linux/etc/quiltrc push' exited with 0Output:
Quoted 5 lines
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 (enforcewith
Quoted 3 lines
-f)
ERROR: firefox-45.6.0esr-r0do_patch: Function failed:patch_do_patchAhh: The patch in the patch does not apply. I tested that before sending and tested it again few seconds ago. It is possible that - since I haven't latest oe-core (or bitbake?) - you have different result.
As far as I can remember there was an announcement by Alexander Kanavin to change patching to more restrictive mode so that the full three lines before/after change must match. Will redo patch creation based on firefox 45.6..
Andreas
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
In reply to Andreas MüllerQuoted 4 lines · Andreas Müller
As far as I can remember there was an announcement by Alexander Kanavin to change patching to more restrictive mode so that the full three lines before/after change must match. Will redo patch creation based on firefox 45.6..
This hasn't yet happened. First we need to fix a ton of oe-core recipes, and we also need to add the capability for automatic patch rebasing to devtool (because this change will break recipes across all layers, and we need to make it easy for people to update patches).
Alex
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
Quoted 8 lines · Alexander Kanavin
Quoted 4 lines · Andreas Müller
As far as I can remember there was an announcement by Alexander Kanavin to change patching to more restrictive mode so that the full three lines before/after change must match. Will redo patch creation based on firefox 45.6..
Quoted 6 lines
This hasn't yet happened. First we need to fix a ton of oe-core recipes, and we also need to add the capability for automatic patch rebasing to devtool (because this change will break recipes across all layers, and we need to make it easy for people to update patches).
Alex
Thanks for this information. Unfortunately this leaves me out of ideas why the patch does not apply for Fabio...
Andreas
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
He could be using more strict PATCHTOOL or the patch got mangled by patchwork/git-am.
Can you upload your changes to some branch for Fabio to compare with what he applied from patchwork?
Quoted 28 lines · Andreas Müller
Quoted 9 lines · Alexander Kanavin
Quoted 4 lines · Andreas Müller
As far as I can remember there was an announcement by Alexander Kanavin to change patching to more restrictive mode so that the full three lines before/after change must match. Will redo patch creation based on firefox 45.6..
This hasn't yet happened. First we need to fix a ton of oe-core recipes,
and
Quoted 1 line
we also need to add the capability for automatic patch rebasing to
devtool
Quoted 4 lines
(because this change will break recipes across all layers, and we need to make it easy for people to update patches).
Alex
Thanks for this information. Unfortunately this leaves me out of ideas why the patch does not apply for Fabio...
Andreas
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
Quoted 6 lines · Martin Jansa
He could be using more strict PATCHTOOL or the patch got mangled by patchwork/git-am.
Can you upload your changes to some branch for Fabio to compare with what he applied from patchwork?
I create the patches from scratch currently and saw minor changes. Will send V3 that should apply hopefully...
Andreas
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
Ok. I'll test v3.
Thanks.
Quoted 18 lines · Andreas Müller
Quoted 6 lines · Martin Jansa
He could be using more strict PATCHTOOL or the patch got mangled by patchwork/git-am.
Can you upload your changes to some branch for Fabio to compare with what he applied from patchwork?
I create the patches from scratch currently and saw minor changes. Will send V3 that should apply hopefully...
Andreas
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
In reply to Fabio BertonQuoted 1 line · Fabio Berton
This patch doesn't apply.
is git://github.com/OSSystems/meta-browser.git
still correct repo for meta-browser?
Andreas
Re: [meta-browser][PATCH V2 2/3] firefox: use pkg-config to find nspr
Yes.
Quoted 15 lines · Andreas Müller
Quoted 1 line · Fabio Berton
This patch doesn't apply.
is
git://github.com/OSSystems/meta-browser.gitstill correct repo for meta-browser?
Andreas
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH v2 3/3 firefox: do not link against crmf library it is not there
In reply to Andreas Müllerand build succeeds without it
fixes:
| <...>/arm-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/6.2.0/ld: error: cannot find -lcrmf
--- ...link-against-crmf-library-it-is-not-there.patch | 47 ++++++++++++++++++++++ recipes-mozilla/firefox/firefox_45.6.0esr.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 recipes-mozilla/firefox/firefox/0003-do-not-link-against-crmf-library-it-is-not-there.patch
recipes-mozilla/firefox/firefox/0003-do-not-link-against-crmf-library-it-is-not-there.patch new file +47 -0
@@ -0,0 +1,47 @@ +From 82862c9be8e1c87d32b639403f1f5715c8f4be59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Thu, 15 Dec 2016 00:23:41 +0100 +Subject: [PATCH] do not link against crmf library - it is not there +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 | 5 ----- + config/external/nss/crmf/moz.build | 1 - + 2 file changed, 6 deletions(-) + +diff --git a/configure b/configure +index 918c8d6..9d31b5c 100755 +--- a/configure ++++ b/configure +@@ -15689,11 +15689,6 @@ echo "configure:15633: checking for NSS - version >= $min_nss_version" >&5 + + fi + +-if test -n "$MOZ_NATIVE_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" +-else +- NSS_CFLAGS="-I${DIST}/include/nss" +-fi + + + echo $ac_n "checking for YASM assembler""... $ac_c" 1>&6 +diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build +index 9b8005f..4bfcc81 100644 +--- a/config/external/nss/crmf/moz.build ++++ b/config/external/nss/crmf/moz.build +@@ -8,7 +8,6 @@ Library('crmf') + + if CONFIG['MOZ_NATIVE_NSS']: + OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')] +- OS_LIBS += ['-lcrmf'] + else: + USE_LIBS += [ + # The dependency on nss is not real, but is required to force the +-- +2.5.5 +
recipes-mozilla/firefox/firefox_45.6.0esr.bb +1 -0
@@ -41,6 +41,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}/source/firefox 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 \ + file://0003-do-not-link-against-crmf-library-it-is-not-there.patch \ " SRC_URI[archive.md5sum] = "ee3cf2401a5716cebacaae5fb70d133f"
Signature · 1 line
2.5.5