From 8281133c6dcb2f31666d76e282d02bafe65e15d7 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jun 2014 21:07:10 +0100 Subject: readline-5.2: exclude autoheader readline hand-maintains config.h.in so exclude autoheader and re-use a patch from readline-6.3 to fix a typo in variable names. See oe-core 8c37d32d6133c6ad2b9142e7a42775e7a979b570 against readline-6.3 for further rationale. Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../readline/files/config-dirent-symbols.patch | 34 ++++++++++++++++++++++ .../readline-6.3/config-dirent-symbols.patch | 34 ---------------------- meta/recipes-core/readline/readline_5.2.bb | 3 ++ 3 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 meta/recipes-core/readline/files/config-dirent-symbols.patch delete mode 100644 meta/recipes-core/readline/readline-6.3/config-dirent-symbols.patch diff --git a/meta/recipes-core/readline/files/config-dirent-symbols.patch b/meta/recipes-core/readline/files/config-dirent-symbols.patch new file mode 100644 index 0000000000..cfff03c0f8 --- /dev/null +++ b/meta/recipes-core/readline/files/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 + +From e48656811550774892fd4e0f4b3c7d418422da52 Mon Sep 17 00:00:00 2001 +From: Ross Burton +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-6.3/config-dirent-symbols.patch b/meta/recipes-core/readline/readline-6.3/config-dirent-symbols.patch deleted file mode 100644 index cfff03c0f8..0000000000 --- a/meta/recipes-core/readline/readline-6.3/config-dirent-symbols.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 - -From e48656811550774892fd4e0f4b3c7d418422da52 Mon Sep 17 00:00:00 2001 -From: Ross Burton -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_5.2.bb b/meta/recipes-core/readline/readline_5.2.bb index 6a37849dbf..fe610e3964 100644 --- a/meta/recipes-core/readline/readline_5.2.bb +++ b/meta/recipes-core/readline/readline_5.2.bb @@ -28,6 +28,7 @@ SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \ ${GNU_MIRROR}/readline/readline-5.2-patches/readline52-013;name=patch13;apply=yes;striplevel=0 \ ${GNU_MIRROR}/readline/readline-5.2-patches/readline52-014;name=patch14;apply=yes;striplevel=0 \ file://configure-fix.patch \ + file://config-dirent-symbols.patch \ file://fix-redundant-rpath.patch" SRC_URI[archive.md5sum] = "e39331f32ad14009b9ff49cc10c5e751" @@ -66,6 +67,8 @@ S = "${WORKDIR}/${BPN}-${PV}" inherit autotools +EXTRA_AUTORECONF += "--exclude=autoheader" + LEAD_SONAME = "libreadline.so" do_configure_prepend () { -- cgit 1.2.3-korg