From b79fcf4542f3ded16c2bf6c2c11eecc359eeb871 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 18 Mar 2014 10:44:25 -0700 Subject: [PATCH] fix(sys-libs/glibc): Build only en_US locale by default. This is only applicable to building the SDK (boards ship with only the built-in C and POSIX locales). The SDK chroot sets en_US by default so there is no reason to waste time building other locales for the tarball. --- .../sys-libs/glibc/files/locale-default-en_US.patch | 13 +++++++++++++ .../{glibc-2.17-r2.ebuild => glibc-2.17-r3.ebuild} | 0 .../coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/locale-default-en_US.patch rename sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/{glibc-2.17-r2.ebuild => glibc-2.17-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/locale-default-en_US.patch b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/locale-default-en_US.patch new file mode 100644 index 0000000000..83f75a4895 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/files/locale-default-en_US.patch @@ -0,0 +1,13 @@ +--- extra/locale/locale.gen.orig 2014-03-18 10:38:23.993988978 -0700 ++++ extra/locale/locale.gen 2014-03-18 10:38:38.140049907 -0700 +@@ -15,8 +15,8 @@ + # rebuilt for you. After updating this file, you can simply run `locale-gen` + # yourself instead of re-emerging glibc. + +-#en_US ISO-8859-1 +-#en_US.UTF-8 UTF-8 ++en_US ISO-8859-1 ++en_US.UTF-8 UTF-8 + #ja_JP.EUC-JP EUC-JP + #ja_JP.UTF-8 UTF-8 + #ja_JP EUC-JP diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild index 3d4314ac1c..8db949d2ef 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/glibc/glibc-2.17.ebuild @@ -156,6 +156,9 @@ eblit-src_unpack-pre() { } eblit-src_unpack-post() { + cd "${WORKDIR}" + epatch "${FILESDIR}"/locale-default-en_US.patch + if use hardened ; then cd "${S}" einfo "Patching to get working PIE binaries on PIE (hardened) platforms"