projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ae2d16a)
package/localedef: bump to version 2.30
authorRomain Naour <romain.naour@gmail.com>
Sat, 25 Jan 2020 23:49:17 +0000 (00:49 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 26 Jan 2020 08:06:22 +0000 (09:06 +0100)
Use the same version as for glibc package.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/localedef/2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436/0001-HACK-only-build-and-install-localedef.patch [deleted file] patch | blob | history
package/localedef/2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436/localedef.hash [deleted file] patch | blob | history
package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch [new file with mode: 0644] patch | blob
package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash [new file with mode: 0644] patch | blob
package/localedef/localedef.mk patch | blob | history

diff --git a/package/localedef/2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436/0001-HACK-only-build-and-install-localedef.patch
deleted file mode 100644 (file)
index d327008..0000000
--- a/package/localedef/2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436/0001-HACK-only-build-and-install-localedef.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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
-
diff --git a/package/localedef/2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436/localedef.hash b/package/localedef/2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436/localedef.hash
deleted file mode 100644 (file)
index b62487c..0000000
--- a/package/localedef/2.29-11-ge28ad442e73b00ae2047d89c8cc7f9b2a0de5436/localedef.hash
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch
new file mode 100644 (file)
index 0000000..d327008
--- /dev/null
+++ b/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch
@@ -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
+
diff --git a/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash b/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash
new file mode 100644 (file)
index 0000000..4283ea0
--- /dev/null
+++ b/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash
@@ -0,0 +1,7 @@
+# Locally calculated (fetched from Github)
+sha256  fe1ca8099bc2cda997d8a585f1a512e59df56c52c9c7363a4058da2725c8f4a9  glibc-2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91.tar.gz
+
+# Hashes for license files
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
+sha256  35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f  LICENSES
diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
index 40057374349d46aa282b83754956560c09b53ff1..10a19290443a7aea1b06fd9d7a6851883047bbc7 100644 (file)
--- a/package/localedef/localedef.mk
+++ b/package/localedef/localedef.mk
@@ -7,7 +7,7 @@
 # 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_VERSION = 2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91
 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
 LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
 LOCALEDEF_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY)