summaryrefslogtreecommitdiff
path: root/packages/glib-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'packages/glib-2.0')
-rw-r--r--packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch30
-rw-r--r--packages/glib-2.0/glib-2.0-2.16.3/.mtn2git_empty0
-rw-r--r--packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch34
-rw-r--r--packages/glib-2.0/glib-2.0-native_2.16.1.bb39
-rw-r--r--packages/glib-2.0/glib-2.0_2.16.1.bb6
-rw-r--r--packages/glib-2.0/glib-2.0_2.16.3.bb11
6 files changed, 111 insertions, 9 deletions
diff --git a/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch
index d6cbeeb8a4..b21851bd63 100644
--- a/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch
+++ b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch
@@ -1,13 +1,29 @@
+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-21 16:18:57.000000000 +0100
-+++ glib-2.16.1/glib/gutils.h 2008-03-21 16:19:09.000000000 +0100
-@@ -97,7 +97,7 @@
+--- 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__)
+-#elif defined (__GNUC__)
-# ifdef __GNUC_STDC_INLINE__
-+# ifdef __GNUC_GNU_INLINE__
- # define G_INLINE_FUNC extern inline __attribute__ ((__gnu_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
++# 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
diff --git a/packages/glib-2.0/glib-2.0-2.16.3/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.16.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.16.3/.mtn2git_empty
diff --git a/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch
new file mode 100644
index 0000000000..3ba79b8986
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch
@@ -0,0 +1,34 @@
+# 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
diff --git a/packages/glib-2.0/glib-2.0-native_2.16.1.bb b/packages/glib-2.0/glib-2.0-native_2.16.1.bb
new file mode 100644
index 0000000000..4a610c4a74
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-native_2.16.1.bb
@@ -0,0 +1,39 @@
+require glib-2.0_${PV}.bb
+
+FILESPATH = "${FILE_DIRNAME}/glib-2.0-${PV}:${FILE_DIRNAME}/files"
+DEPENDS = "gtk-doc-native"
+PR = "r1"
+
+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}
+ 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 () {
+ :
+}
diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb
index ef7a1e84fc..db388d7277 100644
--- a/packages/glib-2.0/glib-2.0_2.16.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.1.bb
@@ -1,10 +1,12 @@
require glib.inc
-PR = "r4"
+PR = "r5"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
file://configure-libtool.patch;patch=1 \
file://gcc-4.2-inline-fix.patch;patch=1 \
file://hurd-arg-max.patch;patch=1 \
- "
+"
+S = "${WORKDIR}/glib-${PV}"
+
diff --git a/packages/glib-2.0/glib-2.0_2.16.3.bb b/packages/glib-2.0/glib-2.0_2.16.3.bb
new file mode 100644
index 0000000000..f70539f18e
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.16.3.bb
@@ -0,0 +1,11 @@
+require glib.inc
+
+# This version requires a newer libtool that isn't default yet
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
+ file://glibconfig-sysdefs.h \
+ file://configure-libtool.patch;patch=1 \
+ "
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 13:32:50 +0000