1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

glib-2.0-native: upgrade to 2.14.5

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3476 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2008-01-13 16:50:00 +00:00
parent f364836768
commit ea38a634d7
4 changed files with 31 additions and 1 deletions
+1 -1
View File
@@ -192,7 +192,7 @@ PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
PREFERRED_VERSION_sato-icon-theme ?= "0.1"
PREFERRED_VERSION_glib-2.0 ?= "2.14.5"
PREFERRED_VERSION_glib-2.0-native ?= "2.12.13"
PREFERRED_VERSION_glib-2.0-native ?= "2.14.5"
PREFERRED_VERSION_atk ?= "1.20.0"
PREFERRED_VERSION_cairo ?= "1.4.10"
PREFERRED_VERSION_pango ?= "1.18.3"
@@ -0,0 +1,29 @@
--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
+++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
@@ -1174,7 +1174,7 @@
G_MODULE_LDFLAGS=
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`
fi
dnl G_MODULE_IMPL= don't reset, so cmd-line can override
G_MODULE_NEED_USCORE=0
@@ -1265,7 +1265,7 @@
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
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 \
-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
glib_cv_rtldglobal_broken,[
@@ -1339,7 +1339,7 @@
AC_MSG_CHECKING(for the suffix of shared libraries)
export SED
-shrext_cmds=`./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
@@ -11,6 +11,7 @@ PR="r2"
SRC_URI = "http://download.gnome.org/sources/glib/2.12/glib-${PV}.tar.bz2 \
file://glib-gettextize-dir.patch;patch=1 \
file://configure-libtool.patch;patch=1 \
file://glibconfig-sysdefs.h"
S = "${WORKDIR}/glib-${PV}"