[Pkg-apache-commits] r1229 - in /trunk/apr: changelog rules

[sf at alioth.debian.org]

Author: sf
Date: Sun Aug 29 20:04:01 2010
New Revision: 1229

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1229
Log:
Disable robust pthread mutexes on armel

Modified:
    trunk/apr/changelog
    trunk/apr/rules

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=1229&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Sun Aug 29 20:04:01 2010
@@ -1,3 +1,10 @@
+apr (1.4.2-5) unstable; urgency=medium
+
+  * Fix FTBFS on armel: Disable robust pthread mutexes on armel, as they
+    cause a hang in the test suite.
+
+ -- Stefan Fritsch <sf at debian.org>  Sun, 29 Aug 2010 22:00:11 +0200
+
 apr (1.4.2-4) unstable; urgency=low
 
   * Fix building with libtool 1.x. Closes: #575380

Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=1229&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Sun Aug 29 20:04:01 2010
@@ -29,6 +29,12 @@
 	apr_cv_epoll_create1=no \
 	apr_cv_dup3=no \
 	apr_cv_accept4=no
+
+# apr_cv_mutex_robust_shared causes hangs in procmutex test on armel
+# let's just disable this for squeeze
+ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_mutex_robust_shared=no
+endif
 
 # SH4 cannot use proc_pthread.
 ifneq (,$(findstring sh4,$(DEB_BUILD_ARCH)))