From fdd523e5a14cacf31dce4dae435267e30dff9222 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 8 Jul 2013 10:45:09 +0800 Subject: glib-2.0: add -march=i486 into CFLAGS automatically when needed. glib configure will check if current gcc need -march=i486, when gcc need -march=i486 but CFLAGS don't have, glib configure will abort and advise the user to add -march=i486. This will break the build process,it's not good for automatic build system. so change this to adding -march=i486 automatically when it is needed. Signed-off-by: Song.Li Signed-off-by: Jackie Huang Signed-off-by: Saul Wold --- .../add-march-i486-into-CFLAGS-automatically.patch | 39 ++++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch (limited to 'meta/recipes-core/glib-2.0') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch b/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch new file mode 100644 index 0000000000..3aac35a5d3 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch @@ -0,0 +1,39 @@ +From 55253b55b9c65f3e0efbbe03cbab2a4c4014a16b Mon Sep 17 00:00:00 2001 +From: Song.Li +Date: Thu, 5 Jul 2012 15:09:41 +0800 +Subject: [PATCH] add -march=i486 into CFLAGS automatically + +Upstream-Status: Inappropriate [configuration] + +glib configure will check if current gcc need -march=i486, +when gcc need -march=i486 but CFLAGS don't have, +glib configure will abort and advise the user to add -march=i486 or later. +This will break the build process,it's not good for automatic build system. +so change this to adding -march=i485 automatically when it is needed. +--- + configure.ac | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +Index: glib-2.36.0/configure.ac +=================================================================== +--- glib-2.36.0.orig/configure.ac ++++ glib-2.36.0/configure.ac +@@ -2378,7 +2378,7 @@ dnl + dnl Note that the atomic ops are only available with GCC on x86 when + dnl using -march=i486 or higher. If we detect that the atomic ops are + dnl not available but would be available given the right flags, we want +-dnl to abort and advise the user to fix their CFLAGS. It's better to do ++dnl to add -march=i486 automatically to fix their CFLAGS. It's better to do + dnl that then to silently fall back on emulated atomic ops just because + dnl the user had the wrong build environment. + +@@ -2401,7 +2401,8 @@ AC_CACHE_CHECK([for lock-free atomic int + AC_TRY_COMPILE([], + [volatile int atomic = 2;\ + __sync_bool_compare_and_swap (&atomic, 2, 3);], +- [AC_MSG_ERROR([GLib must be build with -march=i486 or later.])], ++ [AC_MSG_WARN([GLib must be build with -march=i486 or later.]) ++ SAVE_CFLAGS="${SAVE_CFLAGS} -march=i486"], + []) + CFLAGS="${SAVE_CFLAGS}" + fi diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb index 463dc0d501..1f784bdcb8 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb @@ -13,6 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://glib-2.0_fix_for_x32.patch \ file://fix-conflicting-rand.patch \ file://Makefile-ptest.patch \ + file://add-march-i486-into-CFLAGS-automatically.patch \ file://run-ptest \ " -- cgit v1.2.3