mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-02 16:28:58 +00:00
gtk+: remove obsolete support for renamed libtool
libtool is now longer renamed to ${host}-libtool, so remove the changes
to support this.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
8936585e28
commit
b176959055
@ -1,36 +0,0 @@
|
|||||||
Upstream-Status: Inappropriate [embedded specific]
|
|
||||||
|
|
||||||
Updated to apply to gtk+-2.24.15
|
|
||||||
|
|
||||||
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
|
||||||
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
|
|
||||||
else
|
|
||||||
@@ -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
|
|
||||||
- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
|
|
||||||
+ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
|
|
||||||
module_deplibs_check=`$module_libtool_config | \
|
|
||||||
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
|
|
||||||
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
|
|
||||||
@@ -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
|
|
||||||
-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
|
||||||
+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
|
||||||
if test -n "$export_dynamic"; then
|
|
||||||
GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
|
||||||
GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
|
||||||
@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
|
|||||||
file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
|
file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
|
||||||
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
|
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
|
||||||
file://xsettings.patch \
|
file://xsettings.patch \
|
||||||
file://hardcoded_libtool.patch \
|
|
||||||
file://toggle-font.diff;striplevel=0 \
|
file://toggle-font.diff;striplevel=0 \
|
||||||
file://doc-fixes.patch \
|
file://doc-fixes.patch \
|
||||||
file://strict-prototypes.patch \
|
file://strict-prototypes.patch \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user