diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-07-17 19:37:52 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-07-17 19:37:52 +0000 |
| commit | 67c67287294bd5a9741b9cbd5ad472fea1b17a39 (patch) | |
| tree | ded5465b755a537cdaf88828e02b8dc1130295b4 | |
| parent | 3b356b11bf8e8b73504faf71adf50dc372d8236a (diff) | |
| download | tor-67c67287294bd5a9741b9cbd5ad472fea1b17a39.tar.gz tor-67c67287294bd5a9741b9cbd5ad472fea1b17a39.zip | |
Do not build with openbsd's malloc unless enable-openbsd-malloc is in DEB_BUILD_OPTIONS
svn:r16028
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b653e5d84b..0588b0dc89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tor (0.2.1.X-alpha-X) Xxperimental; urgency=low + + * Do not build with openbsd's malloc unless enable-openbsd-malloc is in + DEB_BUILD_OPTIONS. + + -- Peter Palfrader <weasel@debian.org> Thu, 17 Jul 2008 21:37:14 +0200 + tor (0.2.1.2-alpha-1) experimental; urgency=low * New alpha release. diff --git a/debian/rules b/debian/rules index b3f2b0dadb..797d67ea5a 100755 --- a/debian/rules +++ b/debian/rules @@ -59,8 +59,8 @@ CONF_OPTIONS = 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))) +# allow building with --enable-openbsd-malloc +ifneq (,$(findstring enable-openbsd-malloc,$(DEB_BUILD_OPTIONS))) CONF_OPTIONS += --enable-openbsd-malloc endif |