[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] strerror-override: avoid bloating errno module
From: |
Eric Blake |
Subject: |
[PATCH 1/2] strerror-override: avoid bloating errno module |
Date: |
Mon, 6 Jun 2011 15:40:15 -0600 |
* modules/errno (Files, configure.ac): Move replacement strings...
* modules/strerror-override: ...to new module.
* modules/strerror (Depends-on): Add strerror-override.
* modules/strerror_r-posix (Depends-on): Likewise.
* MODULES.html.sh: Document new module.
Reported by Bruno Haible.
Signed-off-by: Eric Blake <address@hidden>
---
I went with the separate module approach.
ChangeLog | 10 ++++++++++
MODULES.html.sh | 1 +
modules/errno | 5 -----
modules/strerror | 1 +
modules/strerror-override | 26 ++++++++++++++++++++++++++
modules/strerror_r-posix | 1 +
6 files changed, 39 insertions(+), 5 deletions(-)
create mode 100644 modules/strerror-override
diff --git a/ChangeLog b/ChangeLog
index 799cdb9..363ee1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-06 Eric Blake <address@hidden>
+
+ strerror-override: avoid bloating errno module
+ * modules/errno (Files, configure.ac): Move replacement strings...
+ * modules/strerror-override: ...to new module.
+ * modules/strerror (Depends-on): Add strerror-override.
+ * modules/strerror_r-posix (Depends-on): Likewise.
+ * MODULES.html.sh: Document new module.
+ Reported by Bruno Haible.
+
2011-06-06 Bruno Haible <address@hidden>
spawn-pipe tests: Rename program.
diff --git a/MODULES.html.sh b/MODULES.html.sh
index f929ecf..26c3fa9 100755
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1626,6 +1626,7 @@ func_all_modules ()
func_module atexit
func_module strtod
func_module strerror
+ func_module strerror-override
func_module mktime
func_end_table
diff --git a/modules/errno b/modules/errno
index 2640ec8..2fee35d 100644
--- a/modules/errno
+++ b/modules/errno
@@ -3,8 +3,6 @@ A POSIX-like <errno.h>.
Files:
lib/errno.in.h
-lib/strerror-override.h
-lib/strerror-override.c
m4/errno_h.m4
Depends-on:
@@ -12,9 +10,6 @@ include_next
configure.ac:
gl_HEADER_ERRNO_H
-if test -n "$ERRNO_H"; then
- AC_LIBOBJ([strerror-override])
-fi
Makefile.am:
BUILT_SOURCES += $(ERRNO_H)
diff --git a/modules/strerror b/modules/strerror
index d4d9c79..3c83cf9 100644
--- a/modules/strerror
+++ b/modules/strerror
@@ -9,6 +9,7 @@ Depends-on:
string
errno [test $REPLACE_STRERROR = 1]
intprops [test $REPLACE_STRERROR = 1]
+strerror-override [test $REPLACE_STRERROR = 1]
verify [test $REPLACE_STRERROR = 1]
configure.ac:
diff --git a/modules/strerror-override b/modules/strerror-override
new file mode 100644
index 0000000..a31e8a1
--- /dev/null
+++ b/modules/strerror-override
@@ -0,0 +1,26 @@
+Description:
+strerror_override() function: provide strings for gnulib-specific errno values
+
+Files:
+lib/strerror-override.h
+lib/strerror-override.c
+
+Depends-on:
+errno
+
+configure.ac:
+AC_REQUIRE([gl_HEADER_ERRNO_H])
+if test -n "$ERRNO_H"; then
+ AC_LIBOBJ([strerror-override])
+fi
+
+Makefile.am:
+
+Include:
+"strerror-override.h"
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/strerror_r-posix b/modules/strerror_r-posix
index 90c9806..c7f18b2 100644
--- a/modules/strerror_r-posix
+++ b/modules/strerror_r-posix
@@ -10,6 +10,7 @@ string
extensions
errno [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R =
1]
lock [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R =
1]
+strerror-override [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R
= 1]
configure.ac:
gl_FUNC_STRERROR_R
--
1.7.4.4
- [PATCHv2] strerror: drop strerror_r dependency, Eric Blake, 2011/06/01
- Re: [PATCHv2] strerror: drop strerror_r dependency, Bruno Haible, 2011/06/03
- [PATCH 1/2] strerror-override: avoid bloating errno module,
Eric Blake <=
- [PATCH 2/2] strerror: work around FreeBSD bug, Eric Blake, 2011/06/06
- Re: [PATCH 2/2] strerror: work around FreeBSD bug, Bruno Haible, 2011/06/07
- Re: [PATCH 2/2] strerror: work around FreeBSD bug, Eric Blake, 2011/06/07
- Re: [PATCH 2/2] strerror: work around FreeBSD bug, Eric Blake, 2011/06/07
- MacOS strerror_r [was: [PATCH 2/2] strerror: work around FreeBSD bug], Eric Blake, 2011/06/08
- Re: MacOS strerror_r, Eric Blake, 2011/06/08
- Re: [PATCH 2/2] strerror: work around FreeBSD bug, Eric Blake, 2011/06/08
Re: [PATCHv2] strerror: drop strerror_r dependency, Bruno Haible, 2011/06/04