summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-03-28 10:03:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-04 11:53:52 +0100
commitfee85f01bb1d8b2019fea17afba36ad1846c42a7 (patch)
tree1d371b6c9517f899512b3e1e6c55dbd8febd1e9d /meta
parent7c0ca0b345e2605f25097c99ddcc5a4f253a91c4 (diff)
downloadpoky-fee85f01bb1d8b2019fea17afba36ad1846c42a7.tar.gz
gtk+3: set proper FLAGS for native
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. (From OE-Core rev: 3f3e249b98182fa50358ade9278e3e26454275b8) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch33
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb4
2 files changed, 36 insertions, 1 deletions
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 0000000000..9ae1088e01
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
@@ -0,0 +1,33 @@
1From 5e16904f94b5f5961f8f6e75716e6d7d228de119 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Fri, 28 Mar 2014 03:10:12 +0000
4Subject: [PATCH] gtk/native/Makefile.am: unset target FLAGS for native build
5
6The target gtk+3 does a native build in its "native" directory, we need
7unset the target FLAGS for native build, otherwise, there might be build
8failures.
9
10Upstream-Status: Pending
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13---
14 gtk/native/Makefile.am | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/gtk/native/Makefile.am b/gtk/native/Makefile.am
18index 64899e9..a1c814a 100644
19--- a/gtk/native/Makefile.am
20+++ b/gtk/native/Makefile.am
21@@ -3,6 +3,9 @@ AM_CFLAGS = @CFLAGS_FOR_BUILD@
22 CPP = @CPP_FOR_BUILD@
23 AM_CPPFLAGS = @CPPFLAGS_FOR_BUILD@
24 AM_LDFLAGS = @LDFLAGS_FOR_BUILD@
25+CFLAGS =
26+CPPFLAGS =
27+LDFLAGS =
28
29 if CROSS_COMPILING
30 if !USE_EXTERNAL_ICON_CACHE
31--
321.8.3.4
33
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 9f8c6abebc..d0174f6093 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)}"
4 4
5SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ 5SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
6 file://hardcoded_libtool.patch \ 6 file://hardcoded_libtool.patch \
7 file://fix-build-when-wayland-backend-enabled.patch" 7 file://fix-build-when-wayland-backend-enabled.patch \
8 file://fix-flags-for-native.patch \
9 "
8 10
9SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b" 11SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b"
10SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427" 12SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427"