aboutsummaryrefslogtreecommitdiffstats
path: root/package/util-linux/patches/000-compile.patch
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2012-04-28 19:54:54 +0000
committerMirko Vogt <mirko@openwrt.org>2012-04-28 19:54:54 +0000
commit90f58064bec669ccc9ddfb2db17c87f1182442be (patch)
tree654ff5a33300bfc219aa01802d8dda4cedbc1e5d /package/util-linux/patches/000-compile.patch
parent1a0ef042317fd83f0fc8cc9ffd434a3419bc5301 (diff)
downloadupstream-90f58064bec669ccc9ddfb2db17c87f1182442be.tar.gz
upstream-90f58064bec669ccc9ddfb2db17c87f1182442be.tar.bz2
upstream-90f58064bec669ccc9ddfb2db17c87f1182442be.zip
update/rename those packages
This patch makes several changes to the util-linux(-ng) package: * rename to util-linux (official name now, util-linux-ng got merged) * bump to last stable version 2.21.1 (was 2.13.0.1 before) * add several new packages * sort packages within Makefile * remove patches which got merged upstream This patch makes some changes to the e2fsprogs package: * bump to last stable version 1.42.2 * libraries moved from e2fsprogs to util-linux - take care of that Signed-off-by: Luka Perkov <openwrt@lukaperkov.net> SVN-Revision: 31499
Diffstat (limited to 'package/util-linux/patches/000-compile.patch')
-rw-r--r--package/util-linux/patches/000-compile.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/package/util-linux/patches/000-compile.patch b/package/util-linux/patches/000-compile.patch
new file mode 100644
index 0000000000..80343f2481
--- /dev/null
+++ b/package/util-linux/patches/000-compile.patch
@@ -0,0 +1,44 @@
+--- a/misc-utils/cal.c
++++ b/misc-utils/cal.c
+@@ -291,41 +291,6 @@ main(int argc, char **argv) {
+ }
+ #endif
+
+-/*
+- * The traditional Unix cal utility starts the week at Sunday,
+- * while ISO 8601 starts at Monday. We read the start day from
+- * the locale database, which can be overridden with the
+- * -s (Sunday) or -m (Monday) options.
+- */
+-#ifdef HAVE_DECL__NL_TIME_WEEK_1STDAY
+- /*
+- * You need to use 2 locale variables to get the first day of the week.
+- * This is needed to support first_weekday=2 and first_workday=1 for
+- * the rare case where working days span across 2 weeks.
+- * This shell script shows the combinations and calculations involved:
+- *
+- * for LANG in en_US ru_RU fr_FR csb_PL POSIX; do
+- * printf "%s:\t%s + %s -1 = " $LANG $(locale week-1stday first_weekday)
+- * date -d"$(locale week-1stday) +$(($(locale first_weekday)-1))day" +%w
+- * done
+- *
+- * en_US: 19971130 + 1 -1 = 0 #0 = sunday
+- * ru_RU: 19971130 + 2 -1 = 1
+- * fr_FR: 19971201 + 1 -1 = 1
+- * csb_PL: 19971201 + 2 -1 = 2
+- * POSIX: 19971201 + 7 -1 = 0
+- */
+- {
+- int wfd;
+- union { unsigned int word; char *string; } val;
+- val.string = nl_langinfo(_NL_TIME_WEEK_1STDAY);
+-
+- wfd = val.word;
+- wfd = day_in_week(wfd % 100, (wfd / 100) % 100, wfd / (100 * 100));
+- weekstart = (wfd + *nl_langinfo(_NL_TIME_FIRST_WEEKDAY) - 1) % 7;
+- }
+-#endif
+-
+ yflag = 0;
+ while ((ch = getopt_long(argc, argv, "13mjsyVh", longopts, NULL)) != -1)
+ switch(ch) {