Patchwork [1/4] readline: add missing STRUCT_DIRENT_D_* symbols to config.h.in

login
register
mail settings
Submitter Ross Burton
Date May 28, 2014, 11:56 a.m.
Message ID <0124c6edfd85eba465f188d08a03a56e7e189e1a.1401277810.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/72895/
State Accepted
Commit 70400ff9bb7555e7295aab63dfe499ef01204092
Headers show

Comments

Ross Burton - May 28, 2014, 11:56 a.m.
readline maintains config.h.in by hand but several symbols are incorrect.  Fix
these so that the test results are reflected in config.h.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../readline-6.3/config-dirent-symbols.patch       |   34 ++++++++++++++++++++
 meta/recipes-core/readline/readline.inc            |    1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta/recipes-core/readline/readline-6.3/config-dirent-symbols.patch

Patch

diff --git a/meta/recipes-core/readline/readline-6.3/config-dirent-symbols.patch b/meta/recipes-core/readline/readline-6.3/config-dirent-symbols.patch
new file mode 100644
index 0000000..cfff03c
--- /dev/null
+++ b/meta/recipes-core/readline/readline-6.3/config-dirent-symbols.patch
@@ -0,0 +1,34 @@ 
+Fix the names of the STRUCT_DIRENT_D symbols to match the names used by both
+configure and the source code.
+
+Upstream-Status: Submitted (http://lists.gnu.org/archive/html/bug-readline/2014-05/msg00008.html)
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From e48656811550774892fd4e0f4b3c7d418422da52 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Tue, 27 May 2014 22:32:31 +0100
+Subject: [PATCH] config.h.in: fix names of STRUCT_DIRENT_D symbols
+
+---
+ config.h.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.h.in b/config.h.in
+index a67e43e..a42acc5 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -244,9 +244,9 @@
+ 
+ #undef HAVE_GETPW_DECLS
+ 
+-#undef STRUCT_DIRENT_HAS_D_INO
++#undef HAVE_STRUCT_DIRENT_D_INO
+ 
+-#undef STRUCT_DIRENT_HAS_D_FILENO
++#undef HAVE_STRUCT_DIRENT_D_FILENO
+ 
+ #undef HAVE_BSD_SIGNALS
+ 
+-- 
+1.7.10.4
+
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 9d78aa9..c33e91a 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -13,6 +13,7 @@  DEPENDS += "ncurses"
 
 SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \
            file://configure-fix.patch \
+           file://config-dirent-symbols.patch \
            file://norpath.patch \
            file://acinclude.m4"