crosswalk: fix build on ARM

[scm/bb/meta-tizen.git] / meta-tizen-common-share / recipes-crosswalk / crosswalk / crosswalk-extraconf.inc

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-extraconf.inc b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-extraconf.inc
index ace3956..2744c0e 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-extraconf.inc
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-extraconf.inc
@@ -4,36 +4,40 @@ DEPENDS += "crosswalk-thirdparty"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/crosswalk:"
 
+SRC_URI += "\
+            file://include.gypi \
+            file://oe-defaults.gypi \
+            "
+SRC_URI += "file://fix-crosbuild.patch"
+SRC_URI += "file://fix-egl-version.patch"
+
 # This comes from the chromium recipe:
 # http://layers.openembedded.org/layerindex/recipe/4969/
 # It allows architecture specific configuration
-SRC_URI += "${INCLUDE_GYPI}"
-SRC_URI += "${OE_DEFAULTS_GYPI}"
-
-SRC_URI += "file://fix-crosbuild.patch"
-
-INCLUDE_GYPI_i586 = "file://include.gypi"
-INCLUDE_GYPI_x86-64 = "file://include.gypi"
-INCLUDE_GYPI_arm = "file://include.gypi"
-OE_DEFAULTS_GYPI_i586 = "file://oe-defaults.gypi"
-OE_DEFAULTS_GYPI_x86-64 = "file://oe-defaults.gypi"
-OE_DEFAULTS_GYPI_arm = "file://oe-defaults.gypi"
+COMPATIBLE_MACHINE = "(-)"
+COMPATIBLE_MACHINE_i586 = "(.*)"
+COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE_armv6 = "(.*)"
+COMPATIBLE_MACHINE_armv7a = "(.*)"
+COMPATIBLE_MACHINE_romley-ivb = "(.*)"
+COMPATIBLE_MACHINE_valleyisland-64 = "(.*)"
+COMPATIBLE_MACHINE_rpi2 = "(.*)"
 
 RDEPENDS_${PN} += "libpulsecommon"
 
 do_compile_prepend() {
 
-    CC_host="gcc"; export CC_host
-    CXX_host="g++"; export CXX_host
-
-    LD="${CXX}" export LD
-    CC="${CC}" export CC
-    CXX="${CXX}" export CXX
-    GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -I${WORKDIR}/oe-defaults.gypi -I${WORKDIR}/include.gypi"
-    GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dhost_clang=0 "
-
-    mkdir -p src/out
-    tar -zxvf ${STAGING_DIR_HOST}${prefix}/share/crosswalk-thirdparty/out.tgz
+ CC_host="gcc"; export CC_host
+ CXX_host="g++"; export CXX_host
+
+ LD="${CXX}" export LD
+ CC="${CC}" export CC
+ CXX="${CXX}" export CXX
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -I${WORKDIR}/oe-defaults.gypi -I${WORKDIR}/include.gypi"
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dhost_clang=0 "
+ 
+ mkdir -p src/out
+ tar -zxvf ${STAGING_DIR_HOST}${prefix}/share/crosswalk-thirdparty/out.tgz
 }
 
 do_configure() {