Skip to contentSkip to conversation

cross-localedef-native: Include locale_t.h

PATCH Superseded Joshua Watt 2 participants 4 messages Dec 6, 2017 – Dec 7, 2017

lore
Share & tools
lore

Joshua Watt

author
#0 lore raw

PATCH 1/1 cross-localedef-native: Include locale_t.h

Newer versions of glibc (2.26) moved the struct locale definition from xlocale.h to bits/types/locale_t.h. For compatibility with build hosts using this version of glibc, include this header.

See f0be25b6336db7492e47d2e8e72eb8af53b5506d in glibc

Signed-off-by Joshua Watt <[email protected]>
---
 .../glibc/cross-localedef-native_2.24.bb           |  1 +
 ...1-Include-locale_t.h-compatibility-header.patch | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch
meta/recipes-core/glibc/cross-localedef-native_2.24.bb +1 -0
index d4cccedb43a..4a77eee2c9b 100644
@@ -36,6 +36,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0023-eglibc-Install-PIC-archives.patch \
            file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \
            file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
+           file://0001-Include-locale_t.h-compatibility-header.patch \
 "
 # Makes for a rather long rev (22 characters), but...
 #
meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch new file +27 -0
new file mode 100644
index 00000000000..634f8d86441
@@ -0,0 +1,27 @@
+From abfeb0cf4e3261a66a7a23abc9aed33c034c850d Mon Sep 17 00:00:00 2001
+From: Joshua Watt <[email protected]>
+Date: Wed, 6 Dec 2017 13:26:19 -0600
+Subject: [PATCH] Include locale_t.h compatibility header
+
+Newer versions of glibc (since 2.26) moved the locale typedefs from
+xlocale.h to bits/types/locale_t.h. Create a compatibility header for
+these newer versions of glibc
+
+See f0be25b6336db7492e47d2e8e72eb8af53b5506d in glibc
+
+Upstream-Status: Inappropriate
+---
+ locale/bits/types/locale_t.h | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 locale/bits/types/locale_t.h
+
+diff --git a/locale/bits/types/locale_t.h b/locale/bits/types/locale_t.h
+new file mode 100644
+index 0000000000..b519a6c5f8
+--- /dev/null
++++ b/locale/bits/types/locale_t.h
+@@ -0,0 +1 @@
++#include <xlocale.h>
+-- 
+2.14.3
+
Signature · 1 line
2.14.3
#1 lore raw

✗ patchtest: failure for cross-localedef-native: Include locale_t.h

== Series Details ==

Series: cross-localedef-native: Include locale_t.h
Revision: 1
URL : https://patchwork.openembedded.org/series/10101/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence]
Suggested fix Sign off the added patch file (meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch)

* Issue Upstream-Status is Inappropriate, but no reason was provided [test_upstream_status_presence_format]

  Suggested fix    Include a brief reason why 0001-Include-locale_t.h-compatibility-header.patch is inappropriate
  Current          Upstream-Status: Inappropriate
  Standard format  Upstream-Status: Inappropriate [reason]

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
author
#2 lore raw

PATCH v2 1/1 cross-localedef-native: Include locale_t.h

In reply to Joshua Watt

Newer versions of glibc (2.26) moved the struct locale definition from xlocale.h to bits/types/locale_t.h. For compatibility with build hosts using this version of glibc, include this header.

See f0be25b6336db7492e47d2e8e72eb8af53b5506d in glibc

Signed-off-by Joshua Watt <[email protected]>
---
 .../glibc/cross-localedef-native_2.24.bb           |  1 +
 ...1-Include-locale_t.h-compatibility-header.patch | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch
meta/recipes-core/glibc/cross-localedef-native_2.24.bb +1 -0
index d4cccedb43a..4a77eee2c9b 100644
@@ -36,6 +36,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0023-eglibc-Install-PIC-archives.patch \
            file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \
            file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
+           file://0001-Include-locale_t.h-compatibility-header.patch \
 "
 # Makes for a rather long rev (22 characters), but...
 #
meta/recipes-core/glibc/glibc/0001-Include-locale_t.h-compatibility-header.patch new file +28 -0
new file mode 100644
index 00000000000..af8a5d61608
@@ -0,0 +1,28 @@
+From abfeb0cf4e3261a66a7a23abc9aed33c034c850d Mon Sep 17 00:00:00 2001
+From: Joshua Watt <[email protected]>
+Date: Wed, 6 Dec 2017 13:26:19 -0600
+Subject: [PATCH] Include locale_t.h compatibility header
+
+Newer versions of glibc (since 2.26) moved the locale typedefs from
+xlocale.h to bits/types/locale_t.h. Create a compatibility header for
+these newer versions of glibc
+
+See f0be25b6336db7492e47d2e8e72eb8af53b5506d in glibc
+
+Upstream-Status: Inappropriate compatibility with newer host glibc
+Signed-off-by: Joshua Watt <[email protected]>
+---
+ locale/bits/types/locale_t.h | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 locale/bits/types/locale_t.h
+
+diff --git a/locale/bits/types/locale_t.h b/locale/bits/types/locale_t.h
+new file mode 100644
+index 0000000000..b519a6c5f8
+--- /dev/null
++++ b/locale/bits/types/locale_t.h
+@@ -0,0 +1 @@
++#include <xlocale.h>
+-- 
+2.14.3
+
Signature · 1 line
2.14.3
#3 lore raw

✗ patchtest: failure for cross-localedef-native: Include locale_t.h (rev2)

In reply to Joshua Watt

== Series Details ==

Series: cross-localedef-native: Include locale_t.h (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/10101/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch morty (currently at 4e9bb9ab2e)

* Issue Upstream-Status is Inappropriate, but no reason was provided [test_upstream_status_presence_format]

  Suggested fix    Include a brief reason why 0001-Include-locale_t.h-compatibility-header.patch is inappropriate
  Current          Upstream-Status: Inappropriate compatibility with newer host glibc
  Standard format  Upstream-Status: Inappropriate [reason]

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe