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() {
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
+ 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() {
GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1"
- # disable nacl if necessary
- GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=1"
+ # Force gold binary from chroot ld.gold provided by binutils-gold
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=1 -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 "
# Linking fails when fatal ld warnings are enabled. See XWALK-1379.
GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
# sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project
# sysroot usage is not needed, we need to use arm libraries from the virtualized environment.
#
+
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= "
+
# Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation
# So force it.
# --no-parallel is added because chroot does not mount a /dev/shm, this will
# cause python multiprocessing.SemLock error.
export GYP_GENERATORS='ninja'
+ export GYP_DEFINES="$GYP_DEFINES arm_float_abi=hard"
./src/xwalk/gyp_xwalk src/xwalk/xwalk-thirdparty.gyp \
--no-parallel \
${GYP_EXTRA_FLAGS} \
-Dclang=0 \
-Dlinux_use_bundled_binutils=0 \
-Dlinux_use_bundled_gold=0 \
+ -Dlinux_use_gold_flags=1 \
-Dtizen=1 \
-Dpython_ver=2.7 \
-Duse_aura=1 \
GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1"
- # disable nacl if necessary
- GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=1"
+ # Force gold binary from chroot ld.gold provided by binutils-gold
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=1 -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 "
# Linking fails when fatal ld warnings are enabled. See XWALK-1379.
GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
# sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project
# sysroot usage is not needed, we need to use arm libraries from the virtualized environment.
#
+
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= "
+
# Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation
# So force it.
# --no-parallel is added because chroot does not mount a /dev/shm, this will
# cause python multiprocessing.SemLock error.
export GYP_GENERATORS='ninja'
+ export GYP_DEFINES="$GYP_DEFINES arm_float_abi=hard"
./src/xwalk/gyp_xwalk src/xwalk/xwalk.gyp \
--no-parallel \
${GYP_EXTRA_FLAGS} \
-Dclang=0 \
-Dlinux_use_bundled_binutils=0 \
-Dlinux_use_bundled_gold=0 \
+ -Dlinux_use_gold_flags=1 \
-Dtizen=1 \
-Dpython_ver=2.7 \
-Duse_aura=1 \
-Duse_system_nspr=1 \
-Duse_system_yasm=1 \
-Dshared_process_mode=1 \
- -Denable_hidpi=1
+ -Denable_hidpi=1 \
+ -Dwerror= \
+ -Dskia_warnings_as_errors=0
ninja ${PARALLEL_MAKE} -C src/out/Release xwalk xwalk_launcher xwalk_application_tools widget-manifest-parser
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=4c34a63b5fd4244d48cf29490c20fe1aca799ef9;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=e02d90f63d504e1126cdb98e24cd0bd168b0d4d9;nobranch=1"
BBCLASSEXTEND += " native "
--- /dev/null
+{
+ 'variables': {
+ # Configure for armv6 compilation
+ 'target_arch': 'arm',
+ 'armv7': 0,
+ 'arm_neon': 0,
+ }
+}
--- /dev/null
+{
+ '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
+ },
+}
],
}],
],
+@@ -5824,8 +5825,8 @@
+ # Set default ARM cross compiling on linux. These can be overridden
+ # using CC/CXX/etc environment variables.
+ 'make_global_settings': [
+- ['CC', '<!(which arm-linux-gnueabihf-gcc)'],
+- ['CXX', '<!(which arm-linux-gnueabihf-g++)'],
++ ['CC', '$(CC)'],
++ ['CXX', '$(CXX)'],
+ ['CC.host', '<(host_cc)'],
+ ['CXX.host', '<(host_cxx)'],
+ ],
--- /dev/null
+diff --git a/src/ozone/wayland/wayland.gyp b/src/ozone/wayland/wayland.gyp
+index 652ada2..6010a09 100644
+--- a/src/ozone/wayland/wayland.gyp
++++ b/src/ozone/wayland/wayland.gyp
+@@ -20,7 +20,7 @@
+ 'type': 'static_library',
+ 'variables': {
+ 'WAYLAND_VERSION': '1.4.0',
+- 'MESA_VERSION': '9.1.3',
++ 'MESA_VERSION': '1.0.0',
+ 'wayland_packages': [
+ 'egl >= <(MESA_VERSION)',
+ 'wayland-client >= <(WAYLAND_VERSION)',
+
--- /dev/null
+{
+ 'variables': {
+ 'target_arch': 'x64',
+ }
+}
--- /dev/null
+{
+ '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,
+ },
+}
--- /dev/null
+{
+ 'variables': {
+ 'target_arch': 'x64',
+ }
+}
--- /dev/null
+{
+ '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,
+ },
+}
--- /dev/null
+{
+ 'variables': {
+ 'target_arch': 'x64',
+ }
+}
--- /dev/null
+{
+ '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,
+ },
+}
export GYP_GENERATORS='ninja'
- GYP_OPTIONS="--depth=. -Dtizen=1 -Dextension_build_type=Debug -Dextension_host_os=pc"
-
- GYP_OPTIONS="$GYP_OPTIONS -Ddisplay_type=wayland"
+ GYP_OPTIONS="--depth=. -Dtizen=1 -Dextension_build_type=Release -Dextension_host_os=ivi -Ddisplay_type=wayland"
./tools/gyp/gyp $GYP_OPTIONS tizen-wrt.gyp
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI += "git://review.tizen.org/platform/framework/web/tizen-extensions-crosswalk;tag=a79b3c4abb9c5b9a50b0a82d3b57b9c83788f8e7;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/tizen-extensions-crosswalk;tag=68cfc61d4b96a335e5ba58c3997a4fbb629759fb;nobranch=1"
BBCLASSEXTEND += " native "