+++ /dev/null
---- 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
+++ /dev/null
-Stole from gentoo bugzilla
-http://bugs.gentoo.org/show_bug.cgi?id=156475
-
-Lets this work with gcc 4.2/4.3
--Khem
-Index: glib-2.16.1/glib/gutils.h
-===================================================================
---- glib-2.16.1.orig/glib/gutils.h 2008-03-10 17:31:56.000000000 -0700
-+++ glib-2.16.1/glib/gutils.h 2008-06-04 15:19:12.000000000 -0700
-@@ -96,13 +96,14 @@
- #ifdef G_IMPLEMENT_INLINES
- # define G_INLINE_FUNC
- # undef G_CAN_INLINE
--#elif defined (__GNUC__)
--# ifdef __GNUC_STDC_INLINE__
--# define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
-+#elif defined (__GNUC__)
-+# if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \
-+ && __STDC_VERSION__ >= 199901L
-+# define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__))
- # else
--# define G_INLINE_FUNC extern inline
-+# define G_INLINE_FUNC extern __inline
- # endif
--#elif defined (G_CAN_INLINE)
-+#elif defined (G_CAN_INLINE)
- # define G_INLINE_FUNC static inline
- #else /* can't inline */
- # define G_INLINE_FUNC
+++ /dev/null
-Source: http://bugzilla.gnome.org/show_bug.cgi?id=522335
-
-This patch fixes the following error.
-
-| make[4]: Entering directory `/home/khem/oe/build/eglibc/tmp-qemuarm/work/armv5te-angstrom-linux-gnueabi/glib-2.0-2.16.1-r3/glib-2.16.1/glib'
-| if ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I.. -I.. -DG_LOG_DOMAIN=\"GLib\" -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -DPCRE_STATIC -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -pthread -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -Wall -MT gtester.o -MD -MP -MF ".deps/gtester.Tpo" -c -o gtester.o gtester.c; \
-| then mv -f ".deps/gtester.Tpo" ".deps/gtester.Po"; else rm -f ".deps/gtester.Tpo"; exit 1; fi
-| gtester.c: In function 'launch_test_binary':
-| gtester.c:276: error: 'ARG_MAX' undeclared (first use in this function)
-| gtester.c:276: error: (Each undeclared identifier is reported only once
-| gtester.c:276: error: for each function it appears in.)
-| gtester.c:276: warning: unused variable 'argv'
-| make[4]: *** [gtester.o] Error 1
-
-
-Index: glib-2.16.1/glib/gtester.c
-===================================================================
---- glib-2.16.1.orig/glib/gtester.c (Revision 6750)
-+++ glib-2.16.1/glib/gtester.c (Arbeitskopie)
-@@ -273,7 +273,8 @@
- GTestLogBuffer *tlb;
- GSList *slist, *free_list = NULL;
- GError *error = NULL;
-- const gchar *argv[ARG_MAX];
-+ int argc = 0;
-+ const gchar **argv;
- GPid pid = 0;
- gint report_pipe[2] = { -1, -1 };
- guint child_report_cb_id = 0;
-@@ -289,7 +290,34 @@
- return FALSE;
- }
-
-+ /* setup argc */
-+ for (slist = subtest_args; slist; slist = slist->next)
-+ argc++;
-+ /* argc++; */
-+ if (subtest_quiet)
-+ argc++;
-+ if (subtest_verbose)
-+ argc++;
-+ if (!subtest_mode_fatal)
-+ argc++;
-+ if (subtest_mode_quick)
-+ argc++;
-+ else
-+ argc++;
-+ if (subtest_mode_perf)
-+ argc++;
-+ if (gtester_list_tests)
-+ argc++;
-+ if (subtest_seedstr)
-+ argc++;
-+ argc++;
-+ if (skip_tests)
-+ argc++;
-+ for (slist = subtest_paths; slist; slist = slist->next)
-+ argc++;
-+
- /* setup argv */
-+ argv = g_malloc ((argc + 1) * sizeof(gchar *));
- argv[i++] = binary;
- for (slist = subtest_args; slist; slist = slist->next)
- argv[i++] = (gchar*) slist->data;
-@@ -343,8 +371,10 @@
- else
- g_warning ("Failed to execute test binary: %s: %s", argv[0], error->message);
- g_clear_error (&error);
-+ g_free (argv);
- return FALSE;
- }
-+ g_free (argv);
-
- subtest_running = TRUE;
- subtest_io_pending = TRUE;
-
+++ /dev/null
-# 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 @@
- 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
+++ /dev/null
-# 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 @@
- 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
+++ /dev/null
-# 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 @@
- 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
+++ /dev/null
-require glib-2.0_${PV}.bb
-
-DEPENDS = "gtk-doc-native"
-EXTRA_OECONF = ""
-PR = "r3"
-
-inherit native
-
-do_configure_prepend() {
- if [ -e ${S}/${TARGET_SYS}-libtool ] ; then
- echo "${TARGET_SYS}-libtool already present"
- else
- cp ${STAGING_BINDIR}/${TARGET_SYS}-libtool ${S}
- fi
-
-}
-
-do_stage () {
- install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
- install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
- install -m 0755 glib-gettextize ${STAGING_BINDIR}/
- oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gio libgio-2.0 ${STAGING_LIBDIR}
- autotools_stage_includes
- install -d ${STAGING_INCDIR}/glib-2.0/glib
- install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
- install -d ${STAGING_DATADIR}/aclocal
- install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
- install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
- install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
- install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
- install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
-}
-
-do_install () {
- :
-}
+++ /dev/null
-require glib.inc
-PR = "${INC_PR}.0"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
- file://glibconfig-sysdefs.h \
- file://configure-libtool.patch \
- file://gcc-4.2-inline-fix.patch \
- file://hurd-arg-max.patch \
-"
-S = "${WORKDIR}/glib-${PV}"
-
-
-SRC_URI[md5sum] = "9852daf0605f827bfd7199ffe4f5b22d"
-SRC_URI[sha256sum] = "f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695"
+++ /dev/null
-require glib.inc
-PR = "${INC_PR}.0"
-
-# This version requires a newer libtool that isn't default yet
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
- file://glibconfig-sysdefs.h \
- file://configure-libtool.patch \
- "
-
-SRC_URI[md5sum] = "195f9a803cc5279dbb39afdf985f44cb"
-SRC_URI[sha256sum] = "562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d"
+++ /dev/null
-require glib.inc
-PR = "${INC_PR}.0"
-
-# This version requires a newer libtool that isn't default yet
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
- file://glibconfig-sysdefs.h \
- file://configure-libtool.patch \
- "
-
-SRC_URI_append_arm = "file://atomic-thumb.patch"
-
-SRC_URI[md5sum] = "2ab79b3c93258827cc6ea8ee50128e49"
-SRC_URI[sha256sum] = "16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d"
+++ /dev/null
-require glib.inc
-PR = "${INC_PR}.0"
-
-# This version requires a newer libtool that isn't default yet
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
- file://glibconfig-sysdefs.h \
- file://configure-libtool.patch \
- "
-
-SRC_URI[md5sum] = "039f02d47d4071322a3f00abf031e5d9"
-SRC_URI[sha256sum] = "cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20"
git.openpandora.org / openembedded.git / commitdiff