crosswalk: add per architecture configuration

Configuration was defined on a per machine basis instead of per
architecture. Defining it for architectures remove redundancy between
configurations and does not restrict the machines to the ones listed in
the recipe.

Same thing is done for crosswalk-thirdparty.

Change-Id: Ic40bbec3a1849385bf098439e7371e9cc5a9cce8
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

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 cc0f981..ace3956 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,38 +4,36 @@ DEPENDS += "crosswalk-thirdparty"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/crosswalk:"
 
-SRC_URI += "\
-            file://include.gypi \
-            file://oe-defaults.gypi \
-            "
-SRC_URI += "file://fix-crosbuild.patch"
-
 # This comes from the chromium recipe:
 # http://layers.openembedded.org/layerindex/recipe/4969/
 # It allows architecture specific configuration
-COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_i586 = "(.*)"
-COMPATIBLE_MACHINE_x86-64 = "(.*)"
-COMPATIBLE_MACHINE_armv6 = "(.*)"
-COMPATIBLE_MACHINE_armv7a = "(.*)"
-COMPATIBLE_MACHINE_romley-ivb = "(.*)"
-COMPATIBLE_MACHINE_valleyisland-64 = "(.*)"
+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"
 
 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() {

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty-extraconf.inc b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty-extraconf.inc
index 2657bdf..2b61259 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty-extraconf.inc
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty-extraconf.inc
@@ -2,22 +2,20 @@ inherit gettext
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/crosswalk:"
 
-SRC_URI += "\
-            file://include.gypi \
-            file://oe-defaults.gypi \
-            "
-SRC_URI += "file://fix-crosbuild.patch"
-
 # This comes from the chromium recipe:
 # http://layers.openembedded.org/layerindex/recipe/4969/
 # It allows architecture specific configuration
-COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_i586 = "(.*)"
-COMPATIBLE_MACHINE_x86-64 = "(.*)"
-COMPATIBLE_MACHINE_armv6 = "(.*)"
-COMPATIBLE_MACHINE_armv7a = "(.*)"
-COMPATIBLE_MACHINE_romley-ivb = "(.*)"
-COMPATIBLE_MACHINE_valleyisland-64 = "(.*)"
+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"
 
 RDEPENDS_${PN} += "libpulsecommon"
 
@@ -25,14 +23,14 @@ DEPENDS += "yasm-native"
 
 do_compile_prepend() {
 
- CC_host="gcc"; export CC_host
- CXX_host="g++"; export CXX_host
+    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 "
+    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 "
 }
 
 do_configure() {

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv7a/include.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/arm/include.gypi
similarity index 100%
rename from meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv7a/include.gypi
rename to meta-tizen-common-share/recipes-crosswalk/crosswalk/files/arm/include.gypi

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv7a/oe-defaults.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/arm/oe-defaults.gypi
similarity index 100%
rename from meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv7a/oe-defaults.gypi
rename to meta-tizen-common-share/recipes-crosswalk/crosswalk/files/arm/oe-defaults.gypi

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv6/include.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv6/include.gypi
deleted file mode 100644 (file)
index 2c88271..0000000
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv6/include.gypi
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  'variables': {
-    # Configure for armv6 compilation
-    'target_arch': 'arm',
-    'armv7': 0,
-    'arm_neon': 0,
-  }
-}

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv6/oe-defaults.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv6/oe-defaults.gypi
deleted file mode 100644 (file)
index 27e1cfe..0000000
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/armv6/oe-defaults.gypi
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  'variables': {
-    'use_system_bzip2': 1,
-    'disable_nacl': 1,
-    'proprietary_codecs': 1,
-    'v8_use_snapshot': 1,
-    'use_system_ffmpeg': 0,
-    'linux_use_tcmalloc': 0,
-    'linux_link_kerberos': 0,
-    'use_kerberos': 0,
-    'use_cups': 0,
-    'use_gnome_keyring': 0,
-    'linux_link_gnome_keyring': 0
-  }, 
-}

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/genericx86-64/include.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/genericx86-64/include.gypi
deleted file mode 100644 (file)
index c2e2a7d..0000000
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/genericx86-64/include.gypi
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  'variables': {
-    'target_arch': 'x64',
-  }
-}

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/genericx86-64/oe-defaults.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/genericx86-64/oe-defaults.gypi
deleted file mode 100644 (file)
index 0a6e8e8..0000000
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/genericx86-64/oe-defaults.gypi
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  'variables': {
-    'use_system_bzip2': 1,
-    'disable_nacl': 1,
-    'proprietary_codecs': 0,
-    'v8_use_snapshot': 1,
-    'use_system_ffmpeg': 0,
-    'linux_use_tcmalloc': 1,
-    'linux_link_kerberos': 0,
-    'use_kerberos': 0,
-    'use_cups': 0,
-    'use_gnome_keyring': 0,
-    'linux_link_gnome_keyring': 0,
-  }, 
-}

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/romley-ivb/include.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/romley-ivb/include.gypi
deleted file mode 100644 (file)
index c2e2a7d..0000000
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/romley-ivb/include.gypi
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  'variables': {
-    'target_arch': 'x64',
-  }
-}

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/romley-ivb/oe-defaults.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/romley-ivb/oe-defaults.gypi
deleted file mode 100644 (file)
index 0a6e8e8..0000000
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/romley-ivb/oe-defaults.gypi
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  'variables': {
-    'use_system_bzip2': 1,
-    'disable_nacl': 1,
-    'proprietary_codecs': 0,
-    'v8_use_snapshot': 1,
-    'use_system_ffmpeg': 0,
-    'linux_use_tcmalloc': 1,
-    'linux_link_kerberos': 0,
-    'use_kerberos': 0,
-    'use_cups': 0,
-    'use_gnome_keyring': 0,
-    'linux_link_gnome_keyring': 0,
-  }, 
-}

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/valleyisland-64/include.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/valleyisland-64/include.gypi
deleted file mode 100644 (file)
index c2e2a7d..0000000
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/valleyisland-64/include.gypi
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  'variables': {
-    'target_arch': 'x64',
-  }
-}

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/valleyisland-64/oe-defaults.gypi b/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/valleyisland-64/oe-defaults.gypi
deleted file mode 100644 (file)
index 0a6e8e8..0000000
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/files/valleyisland-64/oe-defaults.gypi
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  'variables': {
-    'use_system_bzip2': 1,
-    'disable_nacl': 1,
-    'proprietary_codecs': 0,
-    'v8_use_snapshot': 1,
-    'use_system_ffmpeg': 0,
-    'linux_use_tcmalloc': 1,
-    'linux_link_kerberos': 0,
-    'use_kerberos': 0,
-    'use_cups': 0,
-    'use_gnome_keyring': 0,
-    'linux_link_gnome_keyring': 0,
-  }, 
-}