From 88da6b4dfa4ad2b53508f9e0b559392cecb69c86 Mon Sep 17 00:00:00 2001 From: Cheyenne Wills Date: Thu, 16 Jul 2020 15:05:13 -0600 Subject: [PATCH] cf: Make local copy of ax_gcc_func_attribute.m4 Make a local copy of ax_gcc_func_attribute from autoconf-archive. This is needed in order to fix a bug in the detection of the fallthrough attribute. Remove ax_gcc_func_attribute.m4 from src/external/autoconf-archive/m4. Update LICENSE file to point to the local copy in src/cf. Change-Id: I6c4244d2cd4edab4262c1820435c00419d85303b Reviewed-on: https://gerrit.openafs.org/14272 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Benjamin Kaduk --- LICENSE | 4 ++-- .../autoconf-archive/m4 => cf}/ax_gcc_func_attribute.m4 | 0 src/external/autoconf-archive-files | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename src/{external/autoconf-archive/m4 => cf}/ax_gcc_func_attribute.m4 (100%) diff --git a/LICENSE b/LICENSE index f200e2a020..b15979444c 100644 --- a/LICENSE +++ b/LICENSE @@ -418,8 +418,8 @@ src/cf/lib-pathname.m4 are covered by the following license: ==================================================== -The files under src/external/autoconf-archive/m4/ are covered by the following -license: +The file src/cf/ax_gcc_func_attribute.m4 and the files under +src/external/autoconf-archive/m4/ are covered by the following license: Copyright (c) 2008 Guido U. Draheim Copyright (c) 2011 Maarten Bosmans diff --git a/src/external/autoconf-archive/m4/ax_gcc_func_attribute.m4 b/src/cf/ax_gcc_func_attribute.m4 similarity index 100% rename from src/external/autoconf-archive/m4/ax_gcc_func_attribute.m4 rename to src/cf/ax_gcc_func_attribute.m4 diff --git a/src/external/autoconf-archive-files b/src/external/autoconf-archive-files index 42c7c3852b..eddcf27a31 100644 --- a/src/external/autoconf-archive-files +++ b/src/external/autoconf-archive-files @@ -1,5 +1,4 @@ m4/ax_append_compile_flags.m4 m4/ax_append_compile_flags.m4 m4/ax_append_flag.m4 m4/ax_append_flag.m4 m4/ax_check_compile_flag.m4 m4/ax_check_compile_flag.m4 -m4/ax_gcc_func_attribute.m4 m4/ax_gcc_func_attribute.m4 m4/ax_require_defined.m4 m4/ax_require_defined.m4