[meta-oe][PATCH 1/7] elbow: use x86 over-ride instead of i586

[meta-oe][PATCH 1/7] elbow: use x86 over-ride instead of i586

[Andre McCurdy]

Support i686 without needing to duplicate the i586 over-ride.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta-efl/recipes-efl/e17/elbow_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/e17/elbow_git.bb b/meta-efl/recipes-efl/e17/elbow_git.bb
index 16664f9..064b794 100644
--- a/meta-efl/recipes-efl/e17/elbow_git.bb
+++ b/meta-efl/recipes-efl/e17/elbow_git.bb
@@ -8,7 +8,7 @@ SRCREV = "b41fd0bc9514ff61bb2a50d957efe4155fa3e6a8"
 
 # webkit-efl isn't available for < armv7a
 COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_i586 = "(.*)"
+COMPATIBLE_MACHINE_x86 = "(.*)"
 COMPATIBLE_MACHINE_x86-64 = "(.*)"
 COMPATIBLE_MACHINE_armv7a = "(.*)"
 
-- 
1.9.1

[meta-oe][PATCH 2/7] webkit-efl.inc: use x86 over-ride instead of i586

[Andre McCurdy]

Support i686 without needing to duplicate the i586 over-ride.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta-efl/recipes-efl/webkit/webkit-efl.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/webkit/webkit-efl.inc b/meta-efl/recipes-efl/webkit/webkit-efl.inc
index cf919ec..aa91572 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl.inc
+++ b/meta-efl/recipes-efl/webkit/webkit-efl.inc
@@ -52,7 +52,7 @@ do_configure_prepend_armv5() {
 
 # and disabled LLINT currently isn't supported, so restrict to armv7a and x86*
 COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_i586 = "(.*)"
+COMPATIBLE_MACHINE_x86 = "(.*)"
 COMPATIBLE_MACHINE_x86-64 = "(.*)"
 COMPATIBLE_MACHINE_armv7a = "(.*)"
 
-- 
1.9.1

[meta-oe][PATCH 3/7] klibc.inc: use x86 over-ride instead of i486/i586/i686

[Andre McCurdy]

32bit x86 is covered by the x86 over-ride, so duplicate over-rides for
i486/i586/i686 are not required.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta-initramfs/recipes-devtools/klibc/klibc.inc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc
index 9f445e1..41b0b29 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc.inc
+++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc
@@ -44,9 +44,6 @@ KLIBC_ARCH_armeb = "arm"
 KLIBC_ARCH_mipsel = "mips"
 KLIBC_ARCH_x86 = "i386"
 KLIBC_ARCH_x86-64 = "x86_64"
-KLIBC_ARCH_i486 = "i386"
-KLIBC_ARCH_i586 = "i386"
-KLIBC_ARCH_i686 = "i386"
 KLIBC_ARCH_pentium = "i386"
 KLIBC_ARCH_powerpc = "ppc"
 KLIBC_ARCH_powerpc64 = "ppc64"
-- 
1.9.1

Re: [meta-oe][PATCH 3/7] klibc.inc: use x86 over-ride instead of i486/i586/i686

[Khem Raj]

On Jun 4, 2015 12:21 PM, "Andre McCurdy" <armccurdy@gmail.com> wrote:
>
> 32bit x86 is covered by the x86 over-ride, so duplicate over-rides for
> i486/i586/i686 are not required.
>
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
>  meta-initramfs/recipes-devtools/klibc/klibc.inc | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc
b/meta-initramfs/recipes-devtools/klibc/klibc.inc
> index 9f445e1..41b0b29 100644
> --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc
> +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc
> @@ -44,9 +44,6 @@ KLIBC_ARCH_armeb = "arm"
>  KLIBC_ARCH_mipsel = "mips"
>  KLIBC_ARCH_x86 = "i386"
>  KLIBC_ARCH_x86-64 = "x86_64"
> -KLIBC_ARCH_i486 = "i386"
> -KLIBC_ARCH_i586 = "i386"
> -KLIBC_ARCH_i686 = "i386"
>  KLIBC_ARCH_pentium = "i386"

You forgot pentium

>  KLIBC_ARCH_powerpc = "ppc"
>  KLIBC_ARCH_powerpc64 = "ppc64"
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[meta-oe][PATCH v2 3/7] klibc.inc: use x86 over-ride instead of i486/i586/i686/pentium

[Andre McCurdy]

32bit x86 is covered by the x86 over-ride, so duplicate over-rides for
i486/i586/i686/pentium are not required.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta-initramfs/recipes-devtools/klibc/klibc.inc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc
index 9f445e1..a707ed5 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc.inc
+++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc
@@ -44,10 +44,6 @@ KLIBC_ARCH_armeb = "arm"
 KLIBC_ARCH_mipsel = "mips"
 KLIBC_ARCH_x86 = "i386"
 KLIBC_ARCH_x86-64 = "x86_64"
-KLIBC_ARCH_i486 = "i386"
-KLIBC_ARCH_i586 = "i386"
-KLIBC_ARCH_i686 = "i386"
-KLIBC_ARCH_pentium = "i386"
 KLIBC_ARCH_powerpc = "ppc"
 KLIBC_ARCH_powerpc64 = "ppc64"
 THIS_LIBKLIBC = "libklibc (= ${PV})"
-- 
1.9.1

[meta-oe][PATCH 4/7] gst-plugins-base: use x86 over-ride instead of i586

[Andre McCurdy]

Support i686 without needing to duplicate the i586 over-ride.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 .../recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
index c8a9499..0bcb659 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
@@ -36,4 +36,4 @@ do_configure_prepend() {
 
 FILES_${PN} += "${datadir}/${BPN}"
 
-CACHED_CONFIGUREVARS_append_i586 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
+CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
-- 
1.9.1

[meta-oe][PATCH 5/7] luajit: use x86 over-ride instead of i586

[Andre McCurdy]

Support i686 without needing to duplicate the i586 over-ride.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
index 48137e3..a11b771 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.3.bb
@@ -25,8 +25,8 @@ EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \
                 TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \
                 TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"'
 EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"'
+EXTRA_OEMAKE_append_x86 = ' HOST_CC="${BUILD_CC} -m32"'
 EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"'
-EXTRA_OEMAKE_append_i586 = ' HOST_CC="${BUILD_CC} -m32"'
 EXTRA_OEMAKE_append_powerpc64 = ' HOST_CC="${BUILD_CC}"'
 EXTRA_OEMAKE_append_arm = ' HOST_CC="${BUILD_CC} -m32"'
 EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"'
-- 
1.9.1

[meta-oe][PATCH 6/7] emacs.inc: use x86 over-ride instead of i586

[Andre McCurdy]

Support i686 without needing to duplicate the i586 over-ride.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta-oe/recipes-support/emacs/emacs.inc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index a1a4965..e706b18 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -36,9 +36,7 @@ FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug"
 TREEDIR = "${WORKDIR}/qemu-treedir"
 
 QEMUARCH= "${TARGET_ARCH}"
-QEMUARCH_i486 = "i386"
-QEMUARCH_i586 = "i386"
-QEMUARCH_i686 = "i386"
+QEMUARCH_x86 = "i386"
 
 # Large stack is required at least on x86_64 host, otherwise random segfaults appear:
 QEMU = "qemu-${QEMUARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR} "
-- 
1.9.1

[meta-oe][PATCH 7/7] mariadb.inc: use x86 over-ride instead of i586

[Andre McCurdy]

Support i686 without needing to duplicate the i586 over-ride.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta-oe/recipes-support/mysql/mariadb.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index 00fa965..5a1cde4 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -174,7 +174,7 @@ FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \
 # Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0
 # which are intentionally non-PIC on 32-bit x86 (see e.g.
 # storage/xtradb/plug.in in the source)
-INSANE_SKIP_libmysqlclient_append_i586 = " textrel"
+INSANE_SKIP_libmysqlclient_append_x86 = " textrel"
 
 FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*"
 FILES_libmysqlclient-r-dev = "\
-- 
1.9.1