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

[sf at alioth.debian.org]

Author: sf
Date: Sun Mar 18 22:19:31 2012
New Revision: 1407

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1407
Log:
merge in NMU

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

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=1407&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Sun Mar 18 22:19:31 2012
@@ -7,6 +7,14 @@
     work in the past.
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 25 Feb 2012 22:36:52 +0100
+
+apr (1.4.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Disable robust pthread mutexes on armhf causes testprocmutex to hang on
+    non-SMP cores. (Closes: #650350)
+
+ -- Hector Oron <zumbi at debian.org>  Thu, 01 Dec 2011 00:04:08 +0000
 
 apr (1.4.5-1) unstable; urgency=high
 

Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=1407&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Sun Mar 18 22:19:31 2012
@@ -30,9 +30,12 @@
 	apr_cv_dup3=no \
 	apr_cv_accept4=no
 
-# apr_cv_mutex_robust_shared causes hangs in procmutex test on armel and alpha
+# apr_cv_mutex_robust_shared causes hangs in procmutex test on arm(el|hf) and alpha
 # let's just disable this for squeeze
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_mutex_robust_shared=no
+endif
+ifneq (,$(findstring armhf,$(DEB_BUILD_ARCH)))
   CONFFLAGS += apr_cv_mutex_robust_shared=no
 endif
 ifneq (,$(findstring alpha,$(DEB_BUILD_ARCH)))