From ab157bfc17ee7dfc6a6ed7b858ac09afb2675922 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 2 Nov 2007 13:22:48 +0000 Subject: [PATCH] Stefan Fiedler: m4: fix usage of C99 restrict keyword; remove obsolete hotfixes.patch [2007091023135431178] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8730 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/m4/hotfixes.patch | 22 ---------------------- package/base/m4/m4.conf | 4 ++++ 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 package/base/m4/hotfixes.patch create mode 100644 package/base/m4/m4.conf diff --git a/package/base/m4/hotfixes.patch b/package/base/m4/hotfixes.patch deleted file mode 100644 index a01f81246..000000000 --- a/package/base/m4/hotfixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./lib/sys_time_.h 2007-05-16 23:33:02.000000000 +0200 -+++ ./lib/sys_time_.h 2007-05-16 23:35:10.000000000 +0200 -@@ -39,7 +39,7 @@ - #if 1 - # undef gettimeofday - # define gettimeofday rpl_gettimeofday --int gettimeofday (struct timeval *restrict, void *restrict); -+int gettimeofday (struct timeval *tv, void *tz); - #endif - - #endif /* _gl_SYS_TIME_H */ ---- ./lib/gettimeofday.c 2007-05-16 23:34:08.000000000 +0200 -+++ ./lib/gettimeofday.c 2007-05-16 23:35:31.000000000 +0200 -@@ -98,7 +98,7 @@ - causes problems. */ - - int --rpl_gettimeofday (struct timeval *restrict tv, void *restrict tz) -+rpl_gettimeofday (struct timeval *tv, void *tz) - { - #undef gettimeofday - #if HAVE_GETTIMEOFDAY diff --git a/package/base/m4/m4.conf b/package/base/m4/m4.conf new file mode 100644 index 000000000..47128a1b1 --- /dev/null +++ b/package/base/m4/m4.conf @@ -0,0 +1,4 @@ +#!/bin/bash + +hook_add preconf 5 "echo ac_cv_c_restrict=__restrict > config.cache" +var_append extraconfopt " " "--cache-file=config.cache"