diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-20 21:10:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 12:35:59 +0000 |
commit | 9de595659e95f4f646d3c08fc258fd1558e9a098 (patch) | |
tree | ef37043fbc9bd9a7dbb77b23e3a7eff2203cafd6 /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch | |
parent | f5eaa5861226c6af5fbb130603268c3d582f08a3 (diff) | |
download | poky-9de595659e95f4f646d3c08fc258fd1558e9a098.tar.gz |
gdk-pixbuf: convert from autotools to meson
Drop autotools-specific patches.
Rework jku's thumbnailer patch into meson configuration.
(From OE-Core rev: 9a1fa28c70882a514d189799df8dd087059d79d9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch deleted file mode 100644 index ecca62a712..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: gdk-pixbuf-2.22.1/configure.ac | ||
4 | =================================================================== | ||
5 | --- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-26 09:06:34.000000000 +0800 | ||
6 | +++ gdk-pixbuf-2.22.1/configure.ac 2010-11-26 09:07:33.000000000 +0800 | ||
7 | @@ -287,7 +287,7 @@ | ||
8 | case $enable_explicit_deps in | ||
9 | auto) | ||
10 | export SED | ||
11 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
12 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
13 | if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then | ||
14 | enable_explicit_deps=yes | ||
15 | else | ||
16 | @@ -484,7 +484,7 @@ | ||
17 | dnl Now we check to see if our libtool supports shared lib deps | ||
18 | dnl (in a rather ugly way even) | ||
19 | if $dynworks; then | ||
20 | - pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" | ||
21 | + pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" | ||
22 | pixbuf_deplibs_check=`$pixbuf_libtool_config | \ | ||
23 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ | ||
24 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` | ||
25 | @@ -957,7 +957,7 @@ | ||
26 | # We are using gmodule-no-export now, but I'm leaving the stripping | ||
27 | # code in place for now, since pango and atk still require gmodule. | ||
28 | export SED | ||
29 | -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
30 | +export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
31 | if test -n "$export_dynamic"; then | ||
32 | GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||
33 | fi | ||