diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-04-21 17:03:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-04-21 17:03:06 +0000 |
| commit | 00bbe8da49a42282ea77885643c4d42a0e0228e4 (patch) | |
| tree | 7473e64e372f14e85549c1b467f7d953cebbce30 | |
| parent | a6bc7ad2138cac169edca088c86bb91aec91210a (diff) | |
| download | openembedded-core-00bbe8da49a42282ea77885643c4d42a0e0228e4.tar.gz openembedded-core-00bbe8da49a42282ea77885643c4d42a0e0228e4.tar.bz2 openembedded-core-00bbe8da49a42282ea77885643c4d42a0e0228e4.tar.xz openembedded-core-00bbe8da49a42282ea77885643c4d42a0e0228e4.zip | |
gtk+: Fix libtool issue causing dynamic module loading to be disabled
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4297 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/gtk+/gtk+-2.12.7/hardcoded_libtool.patch | 6 | ||||
| -rw-r--r-- | meta/packages/gtk+/gtk+_2.12.7.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/gtk+/gtk+-2.12.7/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.12.7/hardcoded_libtool.patch index 6adb0cfef..1c2cd0576 100644 --- a/meta/packages/gtk+/gtk+-2.12.7/hardcoded_libtool.patch +++ b/meta/packages/gtk+/gtk+-2.12.7/hardcoded_libtool.patch @@ -5,7 +5,7 @@ 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` ++ 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 @@ -14,7 +14,7 @@ dnl (in a rather ugly way even) if $dynworks; then - pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" pixbuf_deplibs_check=`$pixbuf_libtool_config | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` @@ -23,7 +23,7 @@ # 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` ++export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` if test -n "$export_dynamic"; then GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/meta/packages/gtk+/gtk+_2.12.7.bb b/meta/packages/gtk+/gtk+_2.12.7.bb index 1f3e6e394..1da49ca04 100644 --- a/meta/packages/gtk+/gtk+_2.12.7.bb +++ b/meta/packages/gtk+/gtk+_2.12.7.bb @@ -1,7 +1,7 @@ require gtk+.inc DEPENDS += "cairo" -PR = "r6" +PR = "r7" SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \ |