From: Ross Burton <ross.burton@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 04/29] gtk+: refresh patches
Date: Mon, 5 Mar 2018 17:20:21 +0000 [thread overview]
Message-ID: <20180305172046.21729-4-ross.burton@intel.com> (raw)
In-Reply-To: <20180305172046.21729-1-ross.burton@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
index 1ae728e70d6..9eb7f6bf5c7 100644
--- a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
@@ -3,19 +3,20 @@ Upstream-Status: Inappropriate [embedded specific]
Updated to apply to gtk+-2.24.15
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
---- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200
-+++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200
-@@ -415,7 +415,7 @@
+Index: gtk+-2.24.31/configure.ac
+===================================================================
+--- gtk+-2.24.31.orig/configure.ac
++++ gtk+-2.24.31/configure.ac
+@@ -415,7 +415,7 @@ AC_MSG_CHECKING([Whether to write depend
case $enable_explicit_deps in
auto)
export SED
- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
- enable_explicit_deps=yes
+ enable_explicit_deps=yes
else
-@@ -774,7 +774,7 @@
+@@ -772,7 +772,7 @@ else
dnl Now we check to see if our libtool supports shared lib deps
dnl (in a rather ugly way even)
if $dynworks; then
@@ -24,7 +25,7 @@ diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
module_deplibs_check=`$module_libtool_config | \
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1574,7 +1574,7 @@
+@@ -1579,7 +1579,7 @@ fi
# We are using gmodule-no-export now, but I'm leaving the stripping
# code in place for now, since pango and atk still require gmodule.
export SED
--
2.11.0
next prev parent reply other threads:[~2018-03-05 17:20 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-05 17:20 [PATCH 01/29] dbus: remove upstreamed patch Ross Burton
2018-03-05 17:20 ` [PATCH 02/29] dbus-glib: refresh patch Ross Burton
2018-03-05 17:24 ` akuster808
2018-03-05 17:26 ` Alexander Kanavin
2018-03-05 17:27 ` Alexander Kanavin
2018-03-05 17:30 ` Burton, Ross
2018-03-05 18:03 ` akuster808
2018-03-05 20:15 ` Burton, Ross
2018-03-06 2:56 ` Paul Eggleton
2018-03-05 17:20 ` [PATCH 03/29] gobject-introspection: refresh patches Ross Burton
2018-03-05 17:20 ` Ross Burton [this message]
2018-03-06 3:09 ` [PATCH 04/29] gtk+: " Khem Raj
2018-03-05 17:20 ` [PATCH 05/29] ovmf: " Ross Burton
2018-03-05 17:20 ` [PATCH 06/29] libxml: " Ross Burton
2018-03-05 17:20 ` [PATCH 07/29] kbd: " Ross Burton
2018-03-05 17:20 ` [PATCH 08/29] dropbear: " Ross Burton
2018-03-05 17:20 ` [PATCH 09/29] nfs-utils: " Ross Burton
2018-03-05 17:20 ` [PATCH 10/29] neard: " Ross Burton
2018-03-05 17:20 ` [PATCH 11/29] iproute2: " Ross Burton
2018-03-05 17:20 ` [PATCH 12/29] squashfs-tools: " Ross Burton
2018-03-05 17:20 ` [PATCH 13/29] mtools: " Ross Burton
2018-03-05 17:20 ` [PATCH 14/29] flex: " Ross Burton
2018-03-05 17:20 ` [PATCH 15/29] ccache: " Ross Burton
2018-03-05 17:20 ` [PATCH 16/29] elfutils: " Ross Burton
2018-03-05 17:20 ` [PATCH 17/29] btrfs-tools: " Ross Burton
2018-03-05 17:20 ` [PATCH 18/29] sysklogd: " Ross Burton
2018-03-05 17:20 ` [PATCH 19/29] watchdog: " Ross Burton
2018-03-05 17:20 ` [PATCH 20/29] unzip: " Ross Burton
2018-03-05 17:20 ` [PATCH 21/29] sysstat: " Ross Burton
2018-03-05 17:20 ` [PATCH 22/29] screen: " Ross Burton
2018-03-05 17:20 ` [PATCH 23/29] lsb: " Ross Burton
2018-03-05 17:20 ` [PATCH 24/29] libaio: " Ross Burton
2018-03-05 17:20 ` [PATCH 25/29] libxcb: " Ross Burton
2018-03-05 17:20 ` [PATCH 26/29] xproto: " Ross Burton
2018-03-05 17:20 ` [PATCH 27/29] vulkan: " Ross Burton
2018-03-05 17:20 ` [PATCH 28/29] libpcre: " Ross Burton
2018-03-05 17:20 ` [PATCH 29/29] usbutils: drop upstreamed patch Ross Burton
2018-03-05 17:35 ` ✗ patchtest: failure for "dbus: remove upstreamed patch..." and 28 more Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180305172046.21729-4-ross.burton@intel.com \
--to=ross.burton@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox