[or-cvs] r13971: Merge r13970: Build the debian package with openbsd malloc (tor/trunk/debian)

[weasel at seul.org]

Author: weasel
Date: 2008-03-11 10:18:48 -0400 (Tue, 11 Mar 2008)
New Revision: 13971

Modified:
   tor/trunk/debian/changelog
   tor/trunk/debian/rules
Log:
Merge r13970: Build the debian package with openbsd malloc


Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2008-03-11 14:17:29 UTC (rev 13970)
+++ tor/trunk/debian/changelog	2008-03-11 14:18:48 UTC (rev 13971)
@@ -2,8 +2,11 @@
 
   * Work around fig2dev failing to build the images on all archs
     (re #457568).
+  * Build with --enable-openbsd-malloc, unless no-enable-openbsd-malloc is
+    found in DEB_BUILD_OPTIONS.  Hopefully this deals with some of the
+    horrible memory fragmentation that glibc's malloc causes.
 
- -- Peter Palfrader <weasel at debian.org>  Wed,  5 Mar 2008 09:47:53 +0100
+ -- Peter Palfrader <weasel at debian.org>  Tue, 11 Mar 2008 14:51:47 +0100
 
 tor (0.2.0.21-rc-1) experimental; urgency=low
 

Modified: tor/trunk/debian/rules
===================================================================
--- tor/trunk/debian/rules	2008-03-11 14:17:29 UTC (rev 13970)
+++ tor/trunk/debian/rules	2008-03-11 14:18:48 UTC (rev 13971)
@@ -53,6 +53,10 @@
 ifneq (,$(findstring with-dmalloc,$(DEB_BUILD_OPTIONS)))
 	CONF_OPTIONS += --with-dmalloc
 endif
+# inhibit building with --enable-openbsd-malloc
+ifeq (,$(findstring no-enable-openbsd-malloc,$(DEB_BUILD_OPTIONS)))
+	CONF_OPTIONS += --enable-openbsd-malloc
+endif
 
 configure: patch-stamp
 config.status: configure