From fe665c32010b568bf65d796e9921acf6ce8b7972 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sat, 12 Nov 2016 19:52:40 +0100
Subject: firefox: use CXXFLAGS from buildsystem, try to resurrect lemote
 support

---
 package/firefox/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'package/firefox/Makefile')

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 947e35f15..2bfb74a82 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -42,7 +42,11 @@ else
 CONFIGURE_ARGS+=	--disable-debug
 endif
 
-CONFIGURE_ENV+=		CROSS_COMPILE=1 OS_ARCH=Linux OS_TARGET=Linux OS_TEST=$(ADK_TARGET_ARCH) \
+CONFIGURE_ENV+=		CROSS_COMPILE=1 \
+			OS_ARCH=Linux \
+			OS_TARGET=Linux \
+			OS_TEST="$(ADK_TARGET_ARCH)" \
+			OS_CXXFLAGS="$(TARGET_CXXFLAGS)" \
 			PYTHON="$(PYTHON)" \
 			HOST_CC="$(HOST_CC)" \
 			HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \
@@ -74,7 +78,6 @@ CONFIGURE_ARGS+=	--prefix=/usr \
 			--disable-tree-freetype \
 			--enable-system-ffi \
 			--enable-system-sqlite \
-			--enable-webrtc \
 			--enable-chrome-format=jar \
 			--enable-necko-protocols=all \
 			--enable-alsa \
@@ -104,7 +107,11 @@ CONFIGURE_ARGS+=	--prefix=/usr \
 			--disable-elf-hack 
 
 ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+CONFIGURE_ARGS+=	--disable-ion \
+			--disable-webrtc
 TARGET_CFLAGS:=		$(subst Os,g3,$(TARGET_CFLAGS))
+else
+CONFIGURE_ARGS+=	--enable-webrtc
 endif
 
 XAKE_FLAGS+=		CROSS_COMPILE=1 OS_ARCH="Linux" OS_TEST="$(ADK_TARGET_ARCH)" OS_RELEASE="2.6" 
-- 
cgit v1.2.3