From e991ca5495bf413f76fab965475f3849283e1213 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 21 Aug 2018 21:48:11 -0700 Subject: [PATCH] firefox: Fix build issues on x86_64 host and target link with pango libs especially with libpangoft2-1.0.so.0 otherwise it pokes at the build host and if build host has this package installed then it tries to link with it /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: /usr/lib/libpangoft2-1.0.so.0: undefined reference to `pango_font_description_set_variations' /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: /usr/lib/libpangoft2-1.0.so.0: undefined reference to `pango_font_description_get_variations' | collect2: error: ld returned 1 exit status Upstream-Status: Pending Signed-off-by: Khem Raj --- gfx/cairo/cairo/src/moz.build | 3 --- js/xpconnect/shell/moz.build | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index b33dc8ab9d..1ed0437eb0 100755 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -244,9 +244,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc') and CONFIG['OS_TARGET'] == 'Android' an CFLAGS += ['-O2'] CXXFLAGS += ['-O2'] -if CONFIG['MOZ_X11']: - CFLAGS += CONFIG['XCFLAGS'] - if CONFIG['MOZ_ENABLE_CAIRO_FT']: CFLAGS += CONFIG['CAIRO_FT_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build index a070870867..d09f72e3d7 100644 --- a/js/xpconnect/shell/moz.build +++ b/js/xpconnect/shell/moz.build @@ -53,3 +53,4 @@ if CONFIG['OS_ARCH'] == 'WINNT': CFLAGS += CONFIG['TK_CFLAGS'] CXXFLAGS += CONFIG['TK_CFLAGS'] OS_LIBS += CONFIG['TK_LIBS'] +OS_LIBS += CONFIG['MOZ_PANGO_LIBS']