r37107 - in /desktop/experimental/glib2.0/debian: changelog patches/13_sparc_prlimit_prototype.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Mar 21 00:22:48 2013
New Revision: 37107

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37107
Log:
* debian/patches/13_sparc_prlimit_prototype.patch:
  + New patch, only use prlimit if the prototype is available.
    Should fix the build on sparc where prlimit is available but
    the prototype is missing. Thanks to Julien Cristau for the
    patch. This works-around #703559 and can be removed when that
    bug is fixed.

Added:
    desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=37107&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Mar 21 00:22:48 2013
@@ -6,6 +6,12 @@
       since the prototype there is missing. The glibc bug to add
       the missing prototype is #703545, we can remove this hack
       when that is fixed.
+  * debian/patches/13_sparc_prlimit_prototype.patch:
+    + New patch, only use prlimit if the prototype is available.
+      Should fix the build on sparc where prlimit is available but
+      the prototype is missing. Thanks to Julien Cristau for the
+      patch. This works-around #703559 and can be removed when that
+      bug is fixed.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 20 Mar 2013 20:05:37 +0100
 

Added: desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch?rev=37107&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch [utf-8] Thu Mar 21 00:22:48 2013
@@ -1,0 +1,23 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -995,6 +995,9 @@
+ AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat)
+ # Check for high-resolution sleep functions
+ AC_CHECK_FUNCS(splice)
++AC_CHECK_DECLS([prlimit], [], [], [[
++#include <sys/time.h>
++#include <sys/resource.h>]])
+ AC_CHECK_FUNCS(prlimit)
+ 
+ # To avoid finding a compatibility unusable statfs, which typically
+--- a/glib/tests/thread.c
++++ b/glib/tests/thread.c
+@@ -130,7 +130,7 @@
+ static void
+ test_thread4 (void)
+ {
+-#ifdef HAVE_PRLIMIT
++#if HAVE_DECL_PRLIMIT && defined(HAVE_PRLIMIT)
+   struct rlimit ol, nl;
+   GThread *thread;
+   GError *error;

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=37107&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Thu Mar 21 00:22:48 2013
@@ -7,5 +7,6 @@
 07_disable_tests_on_slow_archs.patch
 10_kfreebsd_issetugid_prototype.patch
 11_kfreebsd_pthread_condattr_setclock_prototype.patch
+13_sparc_prlimit_prototype.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch