diff -u apr-1.4.5/debian/changelog apr-1.4.5/debian/changelog --- apr-1.4.5/debian/changelog +++ apr-1.4.5/debian/changelog @@ -1,3 +1,10 @@ +apr (1.4.5-1.1ubuntu2) precise; urgency=low + + * Revert the previous upload; apr_cv_mutex_robust_shared still + hangs on our current buildd setup; need to revisit later. + + -- Adam Conrad Fri, 24 Feb 2012 04:51:20 -0700 + apr (1.4.5-1.1ubuntu1) precise; urgency=low * debian/rules: Re-enable apr_cv_mutex_robust_shared support on diff -u apr-1.4.5/debian/rules apr-1.4.5/debian/rules --- apr-1.4.5/debian/rules +++ apr-1.4.5/debian/rules @@ -30,8 +30,14 @@ apr_cv_dup3=no \ apr_cv_accept4=no -# apr_cv_mutex_robust_shared causes hangs in procmutex test on 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))) CONFFLAGS += apr_cv_mutex_robust_shared=no endif