* apt-pkg/contrib/mmap.cc:

  - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on
    non-Linux architectures (as it uses mremap).

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index aa52b4c..4d5fcf7 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -317,7 +317,7 @@ unsigned long DynamicMMap::WriteString(const char *String,
    but why we should not at least try to grow it before we give up? */
 bool DynamicMMap::Grow()
 {
-#ifdef _POSIX_MAPPED_FILES
+#if defined(_POSIX_MAPPED_FILES) && defined(__linux__)
    unsigned long newSize = WorkSpace + 1024*1024;
 
    if(Fd != 0)

diff --git a/debian/changelog b/debian/changelog
index cb5e74c..4e3177e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
 apt (0.7.23) unstable; urgency=low
 
+  [ Michael Vogt ]
   * cmdline/apt-get.cc:
     - honor APT::Get::Only-Source properly in FindSrc() (thanks to
       Martin Pitt for reporting the problem)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jul 2009 15:27:30 +0200
+  [ Julian Andres Klode ]
+  * apt-pkg/contrib/mmap.cc:
+    - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on
+      non-Linux architectures (as it uses mremap).
+
+ -- Julian Andres Klode <jak@debian.org>  Sun, 02 Aug 2009 19:35:23 +0200
 
 apt (0.7.22) unstable; urgency=low