1From e991ca5495bf413f76fab965475f3849283e1213 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 21 Aug 2018 21:48:11 -0700
4Subject: [PATCH] firefox: Fix build issues on x86_64 host and target
5
6link with pango libs especially with libpangoft2-1.0.so.0
7otherwise it pokes at the build host and if build host has
8this package installed then it tries to link with it
9
10/mnt/a/oe/build/tmp/work/core2-64-bec-linux/firefox/52.9.0esr-r0/recipe-sysroot-native/usr/bin/x86_64-bec-linux/../../libexec/x86_64-bec-linux/gcc/x86_64-bec-linux/8.2.0/ld:
11/usr/lib/libpangoft2-1.0.so.0: undefined reference to `pango_font_description_set_variations'
12
13/mnt/a/oe/build/tmp/work/core2-64-bec-linux/firefox/52.9.0esr-r0/recipe-sysroot-native/usr/bin/x86_64-bec-linux/../../libexec/x86_64-bec-linux/gcc/x86_64-bec-linux/8.2.0/ld:
14/usr/lib/libpangoft2-1.0.so.0: undefined reference to `pango_font_description_get_variations'
15| collect2: error: ld returned 1 exit status
16
17Upstream-Status: Pending
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19
20---
21 gfx/cairo/cairo/src/moz.build | 3 ---
22 js/xpconnect/shell/moz.build  | 1 +
23 2 files changed, 1 insertion(+), 3 deletions(-)
24
25diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
26index b33dc8ab9d..1ed0437eb0 100755
27--- a/gfx/cairo/cairo/src/moz.build
28+++ b/gfx/cairo/cairo/src/moz.build
29@@ -244,9 +244,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc') and CONFIG['OS_TARGET'] == 'Android' an
30     CFLAGS += ['-O2']
31     CXXFLAGS += ['-O2']
32
33-if CONFIG['MOZ_X11']:
34-    CFLAGS += CONFIG['XCFLAGS']
35-
36 if CONFIG['MOZ_ENABLE_CAIRO_FT']:
37     CFLAGS += CONFIG['CAIRO_FT_CFLAGS']
38     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
39diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build
40index a070870867..d09f72e3d7 100644
41--- a/js/xpconnect/shell/moz.build
42+++ b/js/xpconnect/shell/moz.build
43@@ -53,3 +53,4 @@ if CONFIG['OS_ARCH'] == 'WINNT':
44 CFLAGS += CONFIG['TK_CFLAGS']
45 CXXFLAGS += CONFIG['TK_CFLAGS']
46 OS_LIBS += CONFIG['TK_LIBS']
47+OS_LIBS += CONFIG['MOZ_PANGO_LIBS']
48