Patchwork [1/1] gtk+3: set proper FLAGS for native

login
register
mail settings
Submitter Robert Yang
Date April 3, 2014, 9:23 a.m.
Message ID <533D28A8.1090107@windriver.com>
Download mbox | patch
Permalink /patch/70047/
State New
Headers show

Comments

Robert Yang - April 3, 2014, 9:23 a.m.
On 03/31/2014 10:07 PM, Burton, Ross wrote:
> On 30 March 2014 11:30, Robert Yang <liezhi.yang@windriver.com> wrote:
>> ++CFLAGS = @CFLAGS_FOR_BUILD@
>> ++CPPFLAGS = @CPPFLAGS_FOR_BUILD@
>> ++LDFLAGS = @LDFLAGS_FOR_BUILD@
>
> So the problem is that the environment is providing a CFLAGS variable
> that automake is then using for native builds alongside
> CFLAGS_FOR_BUILD.  Instead of replicating the variables, which this
> will do, would it be better to unset CFLAGS/CPPFLAGS/LDFLAGS in this
> makefile so the environment variables are not used? (as makefile
> assignments override environment assignments).
>

Sounds good, updated:

   git://git.openembedded.org/openembedded-core-contrib rbt/gtk
   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/gtk

  SRC_URI[sha256sum] = 
"b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427"

Patch

diff --git a/meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch 
b/meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
new file mode 100644
index 0000000..9ae1088
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
@@ -0,0 +1,33 @@ 
+From 5e16904f94b5f5961f8f6e75716e6d7d228de119 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Fri, 28 Mar 2014 03:10:12 +0000
+Subject: [PATCH] gtk/native/Makefile.am: unset target FLAGS for native build
+
+The target gtk+3 does a native build in its "native" directory, we need
+unset the target FLAGS for native build, otherwise, there might be build
+failures.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ gtk/native/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gtk/native/Makefile.am b/gtk/native/Makefile.am
+index 64899e9..a1c814a 100644
+--- a/gtk/native/Makefile.am
++++ b/gtk/native/Makefile.am
+@@ -3,6 +3,9 @@ AM_CFLAGS = @CFLAGS_FOR_BUILD@
+ CPP = @CPP_FOR_BUILD@
+ AM_CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+ AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
++CFLAGS =
++CPPFLAGS =
++LDFLAGS =
+
+ if CROSS_COMPILING
+ if !USE_EXTERNAL_ICON_CACHE
+--
+1.8.3.4
+
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb 
b/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb
index 9f8c6ab..d0174f6 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb
@@ -4,7 +4,9 @@  MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"

  SRC_URI = 
"http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
             file://hardcoded_libtool.patch \
-           file://fix-build-when-wayland-backend-enabled.patch"
+           file://fix-build-when-wayland-backend-enabled.patch \
+           file://fix-flags-for-native.patch \
+          "

  SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b"