diff options
author | Ross Burton <ross.burton@intel.com> | 2019-07-05 17:20:17 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-11 09:32:50 +0100 |
commit | c9f400d639f9ed48f69b9b99883825fd8cc3b82c (patch) | |
tree | c8980fd5c6d10d313a50c6a1274e9b69007343ad /meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | |
parent | 696cf580a57de6a0602b51d4a191d54bac901bdd (diff) | |
download | poky-c9f400d639f9ed48f69b9b99883825fd8cc3b82c.tar.gz |
gtk+: remove GTK+ 2
GTK+ 2 is ancient, and shouldn't be used. It will be moved to meta-oe for
people who do need it, but it shouldn't in oe-core.
[ YOCTO #12673 ]
(From OE-Core rev: 3c692e0d77e68908ab0ec421356bd4738c5327db)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch deleted file mode 100644 index 9eb7f6bf5c..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Updated to apply to gtk+-2.24.15 | ||
4 | |||
5 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
6 | Index: 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//"` | ||