mirror of
https://git.yoctoproject.org/poky
synced 2026-04-04 23:02:22 +02:00
glib-2.0: Update patch to work with libtool 2.2.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4247 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
# Poky renames libtool to $host_alias-libtool.
|
||||
# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
|
||||
# so we can't call # it at this point. We can safely assume a version is available
|
||||
# from PATH though
|
||||
|
||||
--- 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 @@
|
||||
@@ -5,7 +10,7 @@
|
||||
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
|
||||
@@ -14,7 +19,7 @@
|
||||
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,[
|
||||
@@ -23,7 +28,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='`
|
||||
+shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='`
|
||||
eval $shrext_cmds
|
||||
module=yes eval std_shrext=$shrext_cmds
|
||||
# chop the initial dot
|
||||
|
||||
@@ -7,7 +7,7 @@ LICENSE = "LGPL"
|
||||
SECTION = "libs"
|
||||
PRIORITY = "optional"
|
||||
DEPENDS += "gtk-doc-native"
|
||||
PR="r2"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "http://download.gnome.org/sources/glib/2.16/glib-${PV}.tar.bz2 \
|
||||
file://glib-gettextize-dir.patch;patch=1 \
|
||||
|
||||
2
meta/packages/glib-2.0/glib-2.0_2.16.3.bb
vendored
2
meta/packages/glib-2.0/glib-2.0_2.16.3.bb
vendored
@@ -1,6 +1,6 @@
|
||||
require glib.inc
|
||||
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
|
||||
file://glibconfig-sysdefs.h \
|
||||
|
||||
Reference in New Issue
Block a user