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

[peters at alioth.debian.org]

Author: peters
Date: Thu Oct  1 06:06:42 2009
New Revision: 1063

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1063
Log:
apr: Apply patch from Nobuhiro Iwamatsu to disable some pthread
functionality on SH4.  (Closes: #549153)

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

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=1063&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Thu Oct  1 06:06:42 2009
@@ -1,3 +1,10 @@
+apr (1.3.8-2) UNRELEASED; urgency=low
+
+  * Apply patch from Nobuhiro Iwamatsu to disable some pthread
+    functionality on SH4.  (Closes: #549153)
+
+ -- Peter Samuelson <peter at p12n.org>  Thu, 01 Oct 2009 01:04:07 -0500
+
 apr (1.3.8-1) unstable; urgency=high
 
   [ Stefan Fritsch ]

Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=1063&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Thu Oct  1 06:06:42 2009
@@ -11,6 +11,7 @@
 DEB_HOST_GNU_TYPE    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_ARCH       ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 BUILDDIR := build-$(DEB_HOST_GNU_TYPE)
 
@@ -21,6 +22,11 @@
 H_LDFLAGS := -Wl,-z,relro
 
 CONFFLAGS += ac_cv_prog_AWK=mawk apr_cv_sctp=no
+
+# SH4 cannot use proc_pthread.
+ifneq (,$(findstring sh4,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_hasprocpthreadser=no ac_cv_define_PTHREAD_PROCESS_SHARED=no
+endif
 
 # Enable debug builds
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))