From d796d42503124e4c39eecd2a81ef1d251a5c5aec Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 2 Apr 2006 12:25:10 +0000 Subject: Remove patch to fix build failure with new POSIX compliant make. --- debian/changelog | 6 ++++-- debian/control | 2 +- debian/patches/00_build_make_beta.patch | 33 --------------------------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 debian/patches/00_build_make_beta.patch diff --git a/debian/changelog b/debian/changelog index 5078966..0107f48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,8 @@ gnumach (1:20060201-1) UNRELEASED; urgency=low - debian/patches/17_net_gcc_4.0.patch: Likewise. - debian/patches/20_ide_disable_irqs.patch: Likewise. - debian/patches/31_tls_ldt.patch: Likewise. - - debian/patches/00_build_make_beta.patch: Sync. - - debian/patches/12_sis900.patch: Likewise. + - debian/patches/00_build_make_beta.patch: Removed, fixed upstream + - debian/patches/12_sis900.patch: Sync. - debian/patches/13_ide_dma.patch: Likewise. - debian/patches/15_mem_obj_proxy.patch: Likewise. - debian/patches/41_io_unlock_ioremove.patch: Likewise. @@ -28,6 +28,8 @@ gnumach (1:20060201-1) UNRELEASED; urgency=low - debian/patches/61_vm_resident-zoned.patch: New file. Thanks to Gianluca Guida . * Build with -fno-strict-aliasing. + * Remove Build-Depend on the new POSIX compliant make, it should work on + old versions as well now. -- Guillem Jover Wed, 1 Feb 2006 23:21:59 +0200 diff --git a/debian/control b/debian/control index 914ee4e..f7eb558 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Marcus Brinkmann , Jeff Bailey , Neal H. Walfield , Guillem Jover Standards-Version: 3.6.2 -Build-Depends: debhelper (>= 5), mig, sharutils, texinfo, make (>= 3.80+3.81.b3) +Build-Depends: debhelper (>= 5), mig, sharutils, texinfo Package: gnumach Section: base diff --git a/debian/patches/00_build_make_beta.patch b/debian/patches/00_build_make_beta.patch deleted file mode 100644 index 75c9838..0000000 --- a/debian/patches/00_build_make_beta.patch +++ /dev/null @@ -1,33 +0,0 @@ -#DPATCHLEVEL=0 - -2006-01-11 Alfred M. Szmidt - - * Makerules.in (migs_d_SCRIPT): New variable. - (%.migs_d): Use it. - (migu_d_SCRIPT): New variable. - %.migu_d): Use it. - ---- Makerules.in.orig 2006-01-31 11:21:04.000000000 +0200 -+++ Makerules.in 2006-02-01 23:28:54.000000000 +0200 -@@ -118,13 +118,17 @@ - - # Here is how to make those dependency files - -+migs_d_SCRIPT = 'set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \ -+ sed -e \'s/[^:]*:/$(@:.migs_d=_server.c) $@:/\' > $@)' -+ - %.migs_d: %.srv -- (set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \ -- sed -e 's/[^:]*:/$(@:.migs_d=_server.c) $@:/' > $@) -+ $(migs_d_SCRIPT) -+ -+migu_d_SCRIPT = 'set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \ -+ sed -e \'s/[^:]*:/$(@:.migu_d=_user.c) $@:/\' > $@)' - - %.migu_d: %.cli -- (set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \ -- sed -e 's/[^:]*:/$(@:.migu_d=_user.c) $@:/' > $@) -+ $(migu_d_SCRIPT) - - %.migsh_d: %.migs_d - sed -e 's/_server\.c /_interface.h /' -e 's/migs_d/migsh_d/' < $< > $@ -- cgit v1.2.3