From e2b0e1a20b071f1516829ffe5bbddbc41007fd63 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 9 Sep 2010 10:14:02 +0200 Subject: [PATCH] regex: Pass the system regex if its only problem is 32-bit regoff_t. * NEWS: Document change. * m4/regex.m4: Disable test for regoff_t size. --- ChangeLog | 6 ++++++ NEWS | 7 +++++++ m4/regex.m4 | 11 ++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9910da220..d42e01797 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-09-10 Paolo Bonzini + + regex: Pass the system regex if its only problem is 32-bit regoff_t. + * NEWS: Document change. + * m4/regex.m4: Disable test for regoff_t size. + 2010-09-13 Jim Meyering fts: don't operate on an invalid file descriptor after failed dup diff --git a/NEWS b/NEWS index 6311533e0..712408f3d 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,13 @@ User visible incompatible changes Date Modules Changes +2010-09-13 regex The module is not guaranteeing anymore support for + 64-bit regoff_t on 64-bit systems. The size of + regoff_t will always be 32-bit unless the program + is being configured --with-included-regex. This + may change again in the future once glibc provides + this feature as well. + 2010-09-12 savedir The fdsavedir function is now deprecated. 2010-09-10 fcntl-h This module now defaults O_CLOEXEC to 0, and diff --git a/m4/regex.m4 b/m4/regex.m4 index 95784e4b5..38f1dd76b 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -158,12 +158,17 @@ AC_DEFUN([gl_REGEX], if (! REG_STARTEND) return 1; - /* Reject hosts whose regoff_t values are too narrow. - These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t - and 32-bit int. */ +#if 0 + /* It would be nice to reject hosts whose regoff_t values are too + narrow (including glibc on hosts with 64-bit ptrdiff_t and + 32-bit int), but we should wait until glibc implements this + feature. Otherwise, support for equivalence classes and + multibyte collation symbols would always be broken except + when compiling --without-included-regex. */ if (sizeof (regoff_t) < sizeof (ptrdiff_t) || sizeof (regoff_t) < sizeof (ssize_t)) return 1; +#endif return 0;]])], [gl_cv_func_re_compile_pattern_working=yes], -- 2.11.0