diff mbox

[040/131] glib: Add version 2.39.2

Message ID c2b535a2c351d46ff7470c05d42b2e41a3094e67.1389702652.git.christian.braunersorensen@prevas.dk
State Accepted
Delegated to: Esben Haabendal
Headers show

Commit Message

christian.braunersorensen@prevas.dk Jan. 14, 2014, 12:33 p.m. UTC
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk>
---
 .../0005-glib-mkenums-interpreter.patch.patch      | 25 +++++++++++++++
 .../60_wait-longer-for-threads-to-die.patch        | 24 ++++++++++++++
 recipes/glib/glib-2.39.2/configure-libtool.patch   | 37 ++++++++++++++++++++++
 recipes/glib/glib-2.39.2/glibconfig-sysdefs.h      |  6 ++++
 recipes/glib/glib_2.39.2.oe                        | 15 +++++++++
 recipes/glib/glib_2.39.2.oe.sig                    |  1 +
 6 files changed, 108 insertions(+)
 create mode 100644 recipes/glib/glib-2.39.2/0005-glib-mkenums-interpreter.patch.patch
 create mode 100644 recipes/glib/glib-2.39.2/60_wait-longer-for-threads-to-die.patch
 create mode 100644 recipes/glib/glib-2.39.2/configure-libtool.patch
 create mode 100644 recipes/glib/glib-2.39.2/glibconfig-sysdefs.h
 create mode 100644 recipes/glib/glib_2.39.2.oe
 create mode 100644 recipes/glib/glib_2.39.2.oe.sig
diff mbox

Patch

diff --git a/recipes/glib/glib-2.39.2/0005-glib-mkenums-interpreter.patch.patch b/recipes/glib/glib-2.39.2/0005-glib-mkenums-interpreter.patch.patch
new file mode 100644
index 0000000..db9a799
--- /dev/null
+++ b/recipes/glib/glib-2.39.2/0005-glib-mkenums-interpreter.patch.patch
@@ -0,0 +1,25 @@ 
+From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sat, 18 Jun 2011 23:52:17 +0200
+Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ gobject/glib-mkenums.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
+index 6372245..b486fe9 100755
+--- a/gobject/glib-mkenums.in
++++ b/gobject/glib-mkenums.in
+@@ -1,4 +1,4 @@
+-#! @PERL_PATH@
++#! /usr/bin/env perl
+ 
+ use warnings;
+ use File::Basename;
+-- 
+1.6.6.1
+
diff --git a/recipes/glib/glib-2.39.2/60_wait-longer-for-threads-to-die.patch b/recipes/glib/glib-2.39.2/60_wait-longer-for-threads-to-die.patch
new file mode 100644
index 0000000..fd9edcd
--- /dev/null
+++ b/recipes/glib/glib-2.39.2/60_wait-longer-for-threads-to-die.patch
@@ -0,0 +1,24 @@ 
+--- glib-2.34.0/tests/threadpool-test.c.orig	2012-10-10 13:13:53.705427296 +0200
++++ glib-2.34.0/tests/threadpool-test.c	2012-10-10 13:13:53.705427296 +0200
+@@ -5,7 +5,7 @@
+ 
+ #include <glib.h>
+ 
+-/* #define DEBUG 1 */
++#define DEBUG 1
+ 
+ #ifdef DEBUG
+ # define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
+@@ -113,10 +113,10 @@
+        if (g_thread_pool_get_num_unused_threads () == 0)
+          break;
+ 
+-       DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
++       DEBUG_MSG (("[unused] waiting FIVE seconds for threads to die"));
+ 
+        /* Some time for threads to die. */
+-       g_usleep (G_USEC_PER_SEC);
++       g_usleep (5 * G_USEC_PER_SEC);
+      }
+ 
+    DEBUG_MSG (("[unused] stopped idle threads, %d remain",
diff --git a/recipes/glib/glib-2.39.2/configure-libtool.patch b/recipes/glib/glib-2.39.2/configure-libtool.patch
new file mode 100644
index 0000000..b59d468
--- /dev/null
+++ b/recipes/glib/glib-2.39.2/configure-libtool.patch
@@ -0,0 +1,37 @@ 
+--- glib-2.34.0.orig/configure.ac.org	2012-10-10 13:08:39.413662089 +0200
++++ glib-2.34.0/configure.ac	2012-10-10 13:09:09.642022583 +0200
+@@ -1477,7 +1477,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
+@@ -1542,13 +1542,13 @@
+ 	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 --tag=CC ${CC} ${CFLAGS} \
++	${SHELL} $host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
+ 		${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
+-	${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
++	${SHELL} $host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
+ 		${LDFLAGS} -module -o plugin.la -export-dynamic \
+ 		-shrext ".o" -avoid-version plugin.lo \
+ 		-rpath /dont/care >/dev/null 2>&1
+-	eval `./libtool --config | grep ^objdir`
++	eval `$host_alias-libtool --config | grep ^objdir`
+ 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ 		glib_cv_rtldglobal_broken,[
+ 		AC_TRY_RUN([
+@@ -1621,7 +1621,7 @@
+ 
+ AC_MSG_CHECKING(for the suffix of module 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/recipes/glib/glib-2.39.2/glibconfig-sysdefs.h b/recipes/glib/glib-2.39.2/glibconfig-sysdefs.h
new file mode 100644
index 0000000..1329e7f
--- /dev/null
+++ b/recipes/glib/glib-2.39.2/glibconfig-sysdefs.h
@@ -0,0 +1,6 @@ 
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32
diff --git a/recipes/glib/glib_2.39.2.oe b/recipes/glib/glib_2.39.2.oe
new file mode 100644
index 0000000..bbfcf94
--- /dev/null
+++ b/recipes/glib/glib_2.39.2.oe
@@ -0,0 +1,15 @@ 
+# -*- mode:python; -*-
+LICENSE = "LGPL-2.0+"
+
+require ${PN}.inc
+
+SRC_URI += "file://glibconfig-sysdefs.h"
+SRC_URI += "file://60_wait-longer-for-threads-to-die.patch"
+SRC_URI += "file://0005-glib-mkenums-interpreter.patch.patch"
+
+do_patch[postfuncs] += "do_patch_extra_files"
+do_patch_extra_files() {
+    install -m 0644 ${SRCDIR}/glibconfig-sysdefs.h .
+}
+
+LIBRARY_VERSION = "0"
diff --git a/recipes/glib/glib_2.39.2.oe.sig b/recipes/glib/glib_2.39.2.oe.sig
new file mode 100644
index 0000000..69ea9bc
--- /dev/null
+++ b/recipes/glib/glib_2.39.2.oe.sig
@@ -0,0 +1 @@ 
+007dc8dc834ae4132e8e34b90ca2a28c186abcf8  glib-2.39.2.tar.xz