From 6e39c2ce74938916e65262db2db541cc479fec60 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sun, 07 Apr 2019 19:55:38 -0400 Subject: patches: Don't patch Git-only files --- diff --git a/patches/0008-Use-gnulib-execute-module.patch b/patches/0008-Use-gnulib-execute-module.patch index b609d41..847d20a 100644 --- a/patches/0008-Use-gnulib-execute-module.patch +++ b/patches/0008-Use-gnulib-execute-module.patch @@ -11,39 +11,6 @@ Subject: [PATCH 08/17] Use gnulib execute module src/pch.c | 40 +++++++++++++++++++++------------------- 3 files changed, 35 insertions(+), 19 deletions(-) -diff --git a/bootstrap.conf b/bootstrap.conf -index 47255fa..7c49a98 100644 ---- a/bootstrap.conf -+++ b/bootstrap.conf -@@ -25,6 +25,7 @@ diffseq - dirname - dup2 - errno -+execute - exitfail - extensions - faccessat -diff --git a/m4/.gitignore b/m4/.gitignore -index 9a94c0e..a84117a 100644 ---- a/m4/.gitignore -+++ b/m4/.gitignore -@@ -275,3 +275,16 @@ xvasprintf.m4 - /utime.m4 - /utime_h.m4 - /nstrftime.m4 -+/execute.m4 -+/fatal-signal.m4 -+/posix_spawn.m4 -+/rawmemchr.m4 -+/sched_h.m4 -+/sig_atomic_t.m4 -+/sigaction.m4 -+/signalblocking.m4 -+/spawn_h.m4 -+/strchrnul.m4 -+/sys_wait_h.m4 -+/wait-process.m4 -+/waitpid.m4 diff --git a/src/pch.c b/src/pch.c index 16e001a..1f14624 100644 --- a/src/pch.c diff --git a/patches/0013-Request-alloca-module-from-gnulib.patch b/patches/0013-Request-alloca-module-from-gnulib.patch deleted file mode 100644 index 0fc258c..0000000 --- a/patches/0013-Request-alloca-module-from-gnulib.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f322a7e0e55924e043b2d9b0d9249b86fb7c271a Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sat, 7 Apr 2018 12:39:03 +0200 -Subject: [PATCH 13/17] Request 'alloca' module from gnulib. - -* bootstrap.conf (gnulib_modules): Add 'alloca'. ---- - bootstrap.conf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bootstrap.conf b/bootstrap.conf -index 7c49a98..68cddd7 100644 ---- a/bootstrap.conf -+++ b/bootstrap.conf -@@ -1,6 +1,6 @@ - # Bootstrap configuration. - --# Copyright (C) 2006-2007, 2009-2012 Free Software Foundation, Inc. -+# Copyright (C) 2006-2007, 2009-2018 Free Software Foundation, Inc. - - # This program is free software: you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -18,6 +18,7 @@ - - # gnulib modules used by this package. - gnulib_modules=" -+alloca - argmatch - backupfile - clock-time --- -2.11.0 - -- cgit v0.9.1