[oe-commits] org.oe.dev gtk 2.12.3: merge libtool patch with poky

[koen commit]

gtk 2.12.3: merge libtool patch with poky

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: d9f2d6094ccb1ca4b12080119adf4ca8db0d1ed5
ViewMTN: http://monotone.openembedded.org/revision/info/d9f2d6094ccb1ca4b12080119adf4ca8db0d1ed5
Files:
1
packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch
packages/gtk+/gtk+_2.12.3.bb
Diffs:

#
# mt diff -r04ee23d775f991ec3d5af0993741eea2eca4d36f -rd9f2d6094ccb1ca4b12080119adf4ca8db0d1ed5
#
#
#
# patch "packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch"
#  from [c9c51ebeaf32844e38b9cc0062ca09911a680f3a]
#    to [a40162e85381f42e96a15ef9f6b7a8293f07fd63]
# 
# patch "packages/gtk+/gtk+_2.12.3.bb"
#  from [0d9c399ba649e1291ca7948faac117dd90dce289]
#    to [95949cd2d16798a7cf86f7865b97ceba3ed9e86d]
#
============================================================
--- packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch	c9c51ebeaf32844e38b9cc0062ca09911a680f3a
+++ packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch	a40162e85381f42e96a15ef9f6b7a8293f07fd63
@@ -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//"`
============================================================
--- packages/gtk+/gtk+_2.12.3.bb	0d9c399ba649e1291ca7948faac117dd90dce289
+++ packages/gtk+/gtk+_2.12.3.bb	95949cd2d16798a7cf86f7865b97ceba3ed9e86d
@@ -1,6 +1,6 @@ require gtk+.inc
 require gtk+.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "cairo"