summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2013-08-29 16:28:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-30 15:23:47 (GMT)
commit1370927687cdc7bbc1de329744b33771345e395f (patch)
treebbb5e37c675f8fdbe7dff0fcff2574e8d7ad9f41 /meta
parent7034d50765349d32090b36a677384878bc16c97f (diff)
downloadpoky-1370927687cdc7bbc1de329744b33771345e395f.tar.gz
gtk+3: pull forward the gtk+2 hardcoded libtool patch
Without this, it tries to run ./libtool, not the sys-prefixed libtool, which fails, resulting in dynamic modules being disabled, which in turn results in compiling the immodules directly into the gtk+3 library. I tried switching it to using $LIBTOOL rather than hardcoding the path, as LT_INIT sets LIBTOOL, but it didn't work, I didn't have time to dig further, and this gets the job done for now. (From OE-Core rev: f74e456772fc80c2333fbdf57c629a18412375e8) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch35
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb1
2 files changed, 36 insertions, 0 deletions
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 0000000..3b4beeb
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch
@@ -0,0 +1,35 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4
5Index: 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//"`
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
index d92d8f3..5db3745 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
@@ -3,6 +3,7 @@ require gtk+3.inc
3MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 3MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
4 4
5SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ 5SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
6 file://hardcoded_libtool.patch \
6 file://no-x11-in-wayland.patch \ 7 file://no-x11-in-wayland.patch \
7 file://wayland-attach.patch" 8 file://wayland-attach.patch"
8 9