mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
@@ -0,0 +1,65 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Olbrich <m.olbrich@pengutronix.de>
|
||||
Date: Mon, 21 May 2018 16:45:02 +0200
|
||||
Subject: [PATCH] HACK: only build and install localedef
|
||||
|
||||
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
|
||||
|
||||
Upstream: https://git.pengutronix.de/cgit/ptxdist/plain/patches/localedef-glibc-2.27/0001-HACK-only-build-and-install-localedef.patch?id=47116f66f411d4dadfce42c2fdd6d41b351ccfd4
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
Rules | 14 ++++++++++----
|
||||
locale/Makefile | 6 +++---
|
||||
2 files changed, 13 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Rules b/Rules
|
||||
index 16afa6acaa..6c208db788 100644
|
||||
--- a/Rules
|
||||
+++ b/Rules
|
||||
@@ -190,10 +190,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
|
||||
$(binaries-all-notests))
|
||||
|
||||
ifneq "$(strip $(binaries-shared-notests))" ""
|
||||
-$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \
|
||||
- $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
|
||||
- $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
|
||||
- $(+link)
|
||||
+$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o
|
||||
+ $(CC) -o $@ \
|
||||
+ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
|
||||
+ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
|
||||
+ $(filter-out $(addprefix $(csu-objpfx),start.o \
|
||||
+ $(start-installed-name))\
|
||||
+ $(+preinit) \
|
||||
+ $(link-extra-libs) \
|
||||
+ $(common-objpfx)libc% $(+postinit),$^) \
|
||||
+ $(link-extra-libs)
|
||||
endif
|
||||
|
||||
ifneq "$(strip $(binaries-shared-tests))" ""
|
||||
diff --git a/locale/Makefile b/locale/Makefile
|
||||
index 764e751c36..c28322d71f 100644
|
||||
--- a/locale/Makefile
|
||||
+++ b/locale/Makefile
|
||||
@@ -32,15 +32,15 @@ categories = ctype messages monetary numeric time paper name \
|
||||
address telephone measurement identification collate
|
||||
aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
|
||||
xlocale localename global-locale coll-lookup
|
||||
-others = localedef locale
|
||||
+others = localedef
|
||||
#others-static = localedef locale
|
||||
-install-bin = localedef locale
|
||||
+install-bin = localedef
|
||||
extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \
|
||||
$(locale-modules:=.o) $(lib-modules:=.o)
|
||||
generated += C-translit.h
|
||||
before-compile += $(objpfx)C-translit.h
|
||||
|
||||
-extra-libs = libBrokenLocale
|
||||
+#extra-libs = libBrokenLocale
|
||||
extra-libs-others = $(extra-libs)
|
||||
|
||||
libBrokenLocale-routines = broken_cur_max
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
# Locally calculated (fetched from Github)
|
||||
sha256 a5d4cbe7eceaefd8bce1104994379818169961b59346d2f3897966912237b1e6 glibc-2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436.tar.gz
|
||||
|
||||
# Hashes for license files
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
||||
sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES
|
||||
2
package/localedef/localedef.hash
Normal file
2
package/localedef/localedef.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# This hash file is not used; instead, update the
|
||||
# hash files in the per-version sub-directories.
|
||||
51
package/localedef/localedef.mk
Normal file
51
package/localedef/localedef.mk
Normal file
@@ -0,0 +1,51 @@
|
||||
################################################################################
|
||||
#
|
||||
# localedef
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# Use the same VERSION and SITE as target glibc
|
||||
# As in glibc.mk, generate version string using:
|
||||
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
|
||||
LOCALEDEF_VERSION = 2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436
|
||||
LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
|
||||
LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
|
||||
LOCALEDEF_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY)
|
||||
HOST_LOCALEDEF_DL_SUBDIR = glibc
|
||||
|
||||
HOST_LOCALEDEF_CONF_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)"
|
||||
|
||||
# Even though we use the autotools-package infrastructure, we have to override
|
||||
# the default configure commands for since we have to build out-of-tree, but we
|
||||
# can't use the same 'symbolic link to configure' used with the gcc packages.
|
||||
define HOST_LOCALEDEF_CONFIGURE_CMDS
|
||||
mkdir -p $(@D)/build
|
||||
# Do the configuration
|
||||
(cd $(@D)/build; \
|
||||
$(HOST_LOCALEDEF_CONF_ENV) \
|
||||
$(HOST_CONFIGURE_OPTS) \
|
||||
$(SHELL) $(@D)/configure \
|
||||
libc_cv_forced_unwind=yes \
|
||||
libc_cv_ssp=no \
|
||||
--target=$(GNU_HOST_NAME) \
|
||||
--host=$(GNU_HOST_NAME) \
|
||||
--build=$(GNU_HOST_NAME) \
|
||||
--prefix=/usr \
|
||||
--with-pkgversion="Buildroot" \
|
||||
--without-cvs \
|
||||
--disable-profile \
|
||||
--without-gd \
|
||||
--enable-obsolete-rpc)
|
||||
endef
|
||||
|
||||
define HOST_LOCALEDEF_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(BR2_MAKE1) $(HOST_LOCALEDEF_MAKE_OPTS) \
|
||||
-C $(@D)/build locale/others
|
||||
endef
|
||||
|
||||
# The makefile does not implement an install target for localedef
|
||||
define HOST_LOCALEDEF_INSTALL_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/build/locale/localedef $(HOST_DIR)/bin/localedef
|
||||
endef
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user