add patch series

2 files changed, 33 insertions, 0 deletions

diff --git a/debian/patches/oot0001-Fix-re-configuring-out-of-tree-builds.patch b/debian/patches/oot0001-Fix-re-configuring-out-of-tree-builds.patch
new file mode 100644
index 0000000..993e671
--- /dev/null
+++ b/debian/patches/oot0001-Fix-re-configuring-out-of-tree-builds.patch
@@ -0,0 +1,32 @@
+From cf81d409818bd07b222af9faeb250de844da6236 Mon Sep 17 00:00:00 2001
+From: Justus Winter <4winter@informatik.uni-hamburg.de>
+Date: Tue, 30 Jun 2015 15:32:17 +0200
+Subject: [PATCH gnumach] Fix re-configuring out-of-tree builds
+
+Previously, running `../configure ...' to reconfigure an out-of-tree
+build would link `machine' to `i386/i386' instead of `../i386/i386'
+(i.e. point to the build directory instead to the source) if
+`i386/i386' also exists in the build directory because of a previous
+build.
+
+* configfrag.ac: Prefix machine link target with `$srcdir'.
+---
+ configfrag.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configfrag.ac b/configfrag.ac
+index 5f13b63..5df6239 100644
+--- a/configfrag.ac
++++ b/configfrag.ac
+@@ -142,7 +142,7 @@ AC_ARG_ENABLE([kmsg],
+ # `${file}' and `$file' have different meanings here with respect to having the
+ # files in the referenced directory considered for `make dist' or not.  See
+ # <http://lists.gnu.org/archive/html/bug-automake/2006-11/msg00027.html>.
+-AC_CONFIG_LINKS([machine:$systype/$systype
++AC_CONFIG_LINKS([machine:$srcdir/$systype/$systype
+ 		 mach/machine:$systype/include/mach/$systype])
+ 
+ dnl Local Variables:
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index fa6ae31..4832306 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ sysenter0001-yyy-sysenter-prototype.patch
 vm-cache-policy0001-VM-cache-policy-change.patch
 vm-cache-policy0002-vm-keep-track-of-clean-pages.patch
 vm-cache-policy0003-vm-evict-clean-pages-first.patch
+oot0001-Fix-re-configuring-out-of-tree-builds.patch