diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2006-07-07 09:41:47 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-07 09:41:47 +0000 |
| commit | 2df9f2514bd102fa98b2579a6d1f38ef7e9c0aba (patch) | |
| tree | 68adefebe24fb58155cf00c4c624c4cedf3b4b9d /packages/glib-2.0 | |
| parent | 9e7357192f5b635576a412aba335a2677ea5964c (diff) | |
| download | openembedded-2df9f2514bd102fa98b2579a6d1f38ef7e9c0aba.tar.gz | |
glib-2.0_2.12.0.bb, gtk+_2.10.0.bb : rediff and add the patches to fix
the hardcoded libtool path in both these packages configure.in as they
are essential.
Both are running on my c7x0 now so they have at least been tested.
Diffstat (limited to 'packages/glib-2.0')
| -rw-r--r-- | packages/glib-2.0/glib-2.0-2.12.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0-2.12.0/configure-libtool.patch | 20 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.12.0.bb | 5 |
3 files changed, 23 insertions, 2 deletions
diff --git a/packages/glib-2.0/glib-2.0-2.12.0/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.12.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.12.0/.mtn2git_empty diff --git a/packages/glib-2.0/glib-2.0-2.12.0/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.12.0/configure-libtool.patch new file mode 100644 index 0000000000..478ef132af --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.12.0/configure-libtool.patch @@ -0,0 +1,20 @@ +--- glib-2.12.0/configure.in.orig 2006-07-07 09:21:56.000000000 +0100 ++++ glib-2.12.0/configure.in 2006-07-07 09:25:44.000000000 +0100 +@@ -1169,7 +1169,7 @@ + dnl No use for this on Win32 + G_MODULE_LDFLAGS= + else +- 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 +@@ -1234,7 +1234,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,[ diff --git a/packages/glib-2.0/glib-2.0_2.12.0.bb b/packages/glib-2.0/glib-2.0_2.12.0.bb index 355a9802ff..2082e4ca6b 100644 --- a/packages/glib-2.0/glib-2.0_2.12.0.bb +++ b/packages/glib-2.0/glib-2.0_2.12.0.bb @@ -10,7 +10,7 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS += "glib-2.0-native gtk-doc" DEPENDS += "virtual/libiconv virtual/libintl" PACKAGES =+ "glib-2.0-utils " -PR = "r0" +PR = "r1" LEAD_SONAME = "libglib-2.0.*" FILES_glib-2.0-utils = "${bindir}/*" @@ -18,7 +18,8 @@ FILES_glib-2.0-utils = "${bindir}/*" EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.12/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h" + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" S = "${WORKDIR}/glib-${PV}" |