[Pkg-apache-commits] r1403 - in /branches/lenny-apr: changelog rules

[sf at alioth.debian.org]

Author: sf
Date: Mon Jan 16 14:45:44 2012
New Revision: 1403

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1403
Log:
Disable robust pthread mutexes on alpha, arm, and armel. Should fix build problems

Modified:
    branches/lenny-apr/changelog
    branches/lenny-apr/rules

Modified: branches/lenny-apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/branches/lenny-apr/changelog?rev=1403&op=diff
==============================================================================
--- branches/lenny-apr/changelog (original)
+++ branches/lenny-apr/changelog Mon Jan 16 14:45:44 2012
@@ -1,3 +1,10 @@
+apr (1.2.12-5+lenny5) UNRELEASED; urgency=low
+
+  * Disable robust pthread mutexes on alpha, arm, and armel. This fixes build
+    problems on buildds running newer Linux kernels.
+
+ -- Stefan Fritsch <sf at debian.org>  Mon, 16 Jan 2012 15:43:38 +0100
+
 apr (1.2.12-5+lenny4) oldstable-security; urgency=low
 
   * Fix regression introduced by fix for CVE-2011-0419:

Modified: branches/lenny-apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/branches/lenny-apr/rules?rev=1403&op=diff
==============================================================================
--- branches/lenny-apr/rules (original)
+++ branches/lenny-apr/rules Mon Jan 16 14:45:44 2012
@@ -24,6 +24,14 @@
 endif
 
 CONFFLAGS += ac_cv_prog_AWK=mawk apr_cv_sctp=no
+
+# apr_cv_mutex_robust_shared causes hangs in procmutex test on arm* and alpha
+ifneq (,$(findstring arm,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_mutex_robust_shared=no
+endif
+ifneq (,$(findstring alpha,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_mutex_robust_shared=no
+endif
 
 # Enable debug builds
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))