summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch36
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb1
2 files changed, 0 insertions, 37 deletions
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
deleted file mode 100644
index 9eb7f6bf5c..0000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Updated to apply to gtk+-2.24.15
4
5Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
6Index: gtk+-2.24.31/configure.ac
7===================================================================
8--- gtk+-2.24.31.orig/configure.ac
9+++ gtk+-2.24.31/configure.ac
10@@ -415,7 +415,7 @@ AC_MSG_CHECKING([Whether to write depend
11 case $enable_explicit_deps in
12 auto)
13 export SED
14- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
15+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
16 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
17 enable_explicit_deps=yes
18 else
19@@ -772,7 +772,7 @@ else
20 dnl Now we check to see if our libtool supports shared lib deps
21 dnl (in a rather ugly way even)
22 if $dynworks; then
23- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
24+ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
25 module_deplibs_check=`$module_libtool_config | \
26 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
27 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
28@@ -1579,7 +1579,7 @@ fi
29 # We are using gmodule-no-export now, but I'm leaving the stripping
30 # code in place for now, since pango and atk still require gmodule.
31 export SED
32-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
33+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
34 if test -n "$export_dynamic"; then
35 GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
36 GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
index ccd82b91f2..082967e04c 100644
--- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" 6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ 7SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
8 file://xsettings.patch \ 8 file://xsettings.patch \
9 file://hardcoded_libtool.patch \
10 file://toggle-font.diff;striplevel=0 \ 9 file://toggle-font.diff;striplevel=0 \
11 file://doc-fixes.patch \ 10 file://doc-fixes.patch \
12 file://strict-prototypes.patch \ 11 file://strict-prototypes.patch \