]> code.ossystems Code Review - openembedded-core.git/commitdiff
glib-2.0: Fix path problems with libtool 2.4
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 13 Jan 2011 15:47:59 +0000 (15:47 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 13 Jan 2011 16:17:06 +0000 (16:17 +0000)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb

index a5dd4f249e5532f817ec33f23400de378583a9d9..7c170be60f045acdeb781732adc9475149a258f6 100644 (file)
@@ -12,7 +12,7 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
  else
    export SED
 -  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+  G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
  fi
  dnl G_MODULE_IMPL= don't reset, so cmd-line can override
  G_MODULE_NEED_USCORE=0
@@ -21,7 +21,7 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
  dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
        echo "void glib_plugin_test(void) { }" > plugin.c
 -      ${SHELL} ./libtool --mode=compile ${CC} -shared \
-+      ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \
++      ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
                -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
        AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
                glib_cv_rtldglobal_broken,[
@@ -30,7 +30,7 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
  AC_MSG_CHECKING(for the suffix of module shared libraries)
  export SED
 -shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-+shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
index 171c8fe6514e99e4c55142804131881be82a5a31..314d9429e3672bda5f5d5e9d7f9a9842d5160de3 100644 (file)
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch \