diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch | 33 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch | 35 |
2 files changed, 68 insertions, 0 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 @@ | |||
1 | From 5e16904f94b5f5961f8f6e75716e6d7d228de119 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Fri, 28 Mar 2014 03:10:12 +0000 | ||
4 | Subject: [PATCH] gtk/native/Makefile.am: unset target FLAGS for native build | ||
5 | |||
6 | The target gtk+3 does a native build in its "native" directory, we need | ||
7 | unset the target FLAGS for native build, otherwise, there might be build | ||
8 | failures. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
13 | --- | ||
14 | gtk/native/Makefile.am | 3 +++ | ||
15 | 1 file changed, 3 insertions(+) | ||
16 | |||
17 | diff --git a/gtk/native/Makefile.am b/gtk/native/Makefile.am | ||
18 | index 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 | -- | ||
32 | 1.8.3.4 | ||
33 | |||
diff --git a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch new file mode 100644 index 0000000000..3b4beeb712 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | |||
5 | Index: gtk+-3.8.2/configure.ac | ||
6 | =================================================================== | ||
7 | --- gtk+-3.8.2.orig/configure.ac | ||
8 | +++ gtk+-3.8.2/configure.ac | ||
9 | @@ -531,7 +531,7 @@ AC_MSG_CHECKING([Whether to write depend | ||
10 | case $enable_explicit_deps in | ||
11 | auto) | ||
12 | export SED | ||
13 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
14 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
15 | if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then | ||
16 | enable_explicit_deps=yes | ||
17 | else | ||
18 | @@ -793,7 +793,7 @@ else | ||
19 | dnl Now we check to see if our libtool supports shared lib deps | ||
20 | dnl (in a rather ugly way even) | ||
21 | if $dynworks; then | ||
22 | - module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" | ||
23 | + module_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" | ||
24 | module_deplibs_check=`$module_libtool_config | \ | ||
25 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ | ||
26 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` | ||
27 | @@ -1528,7 +1528,7 @@ fi | ||
28 | # We are using gmodule-no-export now, but I'm leaving the stripping | ||
29 | # code in place for now, since pango and atk still require gmodule. | ||
30 | export SED | ||
31 | -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
32 | +export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
33 | if test -n "$export_dynamic"; then | ||
34 | GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||
35 | GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||