[oe] [meta-browser][PATCH V2 3/3] firefox: do not link against crmf library - it is not there
Andreas Müller
schnitzeltony at googlemail.com
Thu Dec 15 17:52:11 UTC 2016
and build succeeds without it
fixes:
| <...>/arm-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/6.2.0/ld: error: cannot find -lcrmf
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
...link-against-crmf-library-it-is-not-there.patch | 47 ++++++++++++++++++++++
recipes-mozilla/firefox/firefox_45.5.1esr.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
diff --git a/recipes-mozilla/firefox/firefox/0003-do-not-link-against-crmf-library-it-is-not-there.patch b/recipes-mozilla/firefox/firefox/0003-do-not-link-against-crmf-library-it-is-not-there.patch
new file mode 100644
index 0000000..65a4a04
--- /dev/null
+++ b/recipes-mozilla/firefox/firefox/0003-do-not-link-against-crmf-library-it-is-not-there.patch
@@ -0,0 +1,47 @@
+From 82862c9be8e1c87d32b639403f1f5715c8f4be59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
+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 <schnitzeltony at googlemail.com>
+---
+ 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
+
diff --git a/recipes-mozilla/firefox/firefox_45.5.1esr.bb b/recipes-mozilla/firefox/firefox_45.5.1esr.bb
index 1f865eb..0e5e775 100644
--- a/recipes-mozilla/firefox/firefox_45.5.1esr.bb
+++ b/recipes-mozilla/firefox/firefox_45.5.1esr.bb
@@ -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] = "ec943bcff82e868d2f5e95dde7edb83f"
--
2.7.4
More information about the Openembedded-devel
mailing list