diff options
author | Juro Bystricky <juro.bystricky@intel.com> | 2018-01-29 14:39:45 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-30 11:50:12 +0000 |
commit | c55aa9f8f0ad712a8d54304da35a4452578f70a5 (patch) | |
tree | 66dea61237918553f27178906c8935c8cb2a91a6 /meta | |
parent | 4eff5858234e604c71e482e8d728d036b5cc5606 (diff) | |
download | poky-c55aa9f8f0ad712a8d54304da35a4452578f70a5.tar.gz |
tzcode: remove unused patch files
(From OE-Core rev: 7118b4df6d43de4d27426826ce2dce93b2baf9b4)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/tzcode/files/0001-Fix-Makefile-quoting-bug.patch | 174 | ||||
-rw-r--r-- | meta/recipes-extended/tzcode/files/0002-Port-zdump-to-C90-snprintf.patch | 115 |
2 files changed, 0 insertions, 289 deletions
diff --git a/meta/recipes-extended/tzcode/files/0001-Fix-Makefile-quoting-bug.patch b/meta/recipes-extended/tzcode/files/0001-Fix-Makefile-quoting-bug.patch deleted file mode 100644 index e49fa09647..0000000000 --- a/meta/recipes-extended/tzcode/files/0001-Fix-Makefile-quoting-bug.patch +++ /dev/null | |||
@@ -1,174 +0,0 @@ | |||
1 | From b520d20b8122a783f99f088758b78d928f70ee34 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Mon, 23 Oct 2017 11:42:45 -0700 | ||
4 | Subject: [PATCH] Fix Makefile quoting bug | ||
5 | |||
6 | Problem with INSTALLARGS reported by Zefram in: | ||
7 | https://mm.icann.org/pipermail/tz/2017-October/025360.html | ||
8 | Fix similar problems too. | ||
9 | * Makefile (ZIC_INSTALL, VALIDATE_ENV, CC, install) | ||
10 | (INSTALL, version, INSTALLARGS, right_posix, posix_right) | ||
11 | (check_public): Use apostrophes to prevent undesirable | ||
12 | interpretation of names by the shell. We still do not support | ||
13 | directory names containing apostrophes or newlines, but this is | ||
14 | good enough. | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
18 | |||
19 | * NEWS: Mention this. | ||
20 | --- | ||
21 | Makefile | 64 ++++++++++++++++++++++++++++++++-------------------------------- | ||
22 | NEWS | 8 ++++++++ | ||
23 | 2 files changed, 40 insertions(+), 32 deletions(-) | ||
24 | |||
25 | diff --git a/Makefile b/Makefile | ||
26 | index c92edc0..97649ca 100644 | ||
27 | --- a/Makefile | ||
28 | +++ b/Makefile | ||
29 | @@ -313,7 +313,7 @@ ZFLAGS= | ||
30 | |||
31 | # How to use zic to install tz binary files. | ||
32 | |||
33 | -ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) | ||
34 | +ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) | ||
35 | |||
36 | # The name of a Posix-compliant 'awk' on your system. | ||
37 | AWK= awk | ||
38 | @@ -341,8 +341,8 @@ SGML_CATALOG_FILES= \ | ||
39 | VALIDATE = nsgmls | ||
40 | VALIDATE_FLAGS = -s -B -wall -wno-unused-param | ||
41 | VALIDATE_ENV = \ | ||
42 | - SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \ | ||
43 | - SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \ | ||
44 | + SGML_CATALOG_FILES='$(SGML_CATALOG_FILES)' \ | ||
45 | + SGML_SEARCH_PATH='$(SGML_SEARCH_PATH)' \ | ||
46 | SP_CHARSET_FIXED=YES \ | ||
47 | SP_ENCODING=UTF-8 | ||
48 | |||
49 | @@ -396,7 +396,7 @@ GZIPFLAGS= -9n | ||
50 | #MAKE= make | ||
51 | |||
52 | cc= cc | ||
53 | -CC= $(cc) -DTZDIR=\"$(TZDIR)\" | ||
54 | +CC= $(cc) -DTZDIR='"$(TZDIR)"' | ||
55 | |||
56 | AR= ar | ||
57 | |||
58 | @@ -473,29 +473,29 @@ all: tzselect yearistype zic zdump libtz.a $(TABDATA) | ||
59 | ALL: all date $(ENCHILADA) | ||
60 | |||
61 | install: all $(DATA) $(REDO) $(MANS) | ||
62 | - mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ | ||
63 | - $(DESTDIR)$(LIBDIR) \ | ||
64 | - $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ | ||
65 | - $(DESTDIR)$(MANDIR)/man8 | ||
66 | + mkdir -p '$(DESTDIR)$(ETCDIR)' '$(DESTDIR)$(TZDIR)' \ | ||
67 | + '$(DESTDIR)$(LIBDIR)' \ | ||
68 | + '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \ | ||
69 | + '$(DESTDIR)$(MANDIR)/man8' | ||
70 | $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) | ||
71 | - cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/. | ||
72 | - cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. | ||
73 | - cp libtz.a $(DESTDIR)$(LIBDIR)/. | ||
74 | - $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a | ||
75 | - cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. | ||
76 | - cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/. | ||
77 | - cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. | ||
78 | + cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.' | ||
79 | + cp tzselect zic zdump '$(DESTDIR)$(ETCDIR)/.' | ||
80 | + cp libtz.a '$(DESTDIR)$(LIBDIR)/.' | ||
81 | + $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a' | ||
82 | + cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.' | ||
83 | + cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.' | ||
84 | + cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.' | ||
85 | |||
86 | INSTALL: ALL install date.1 | ||
87 | - mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 | ||
88 | - cp date $(DESTDIR)$(BINDIR)/. | ||
89 | - cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. | ||
90 | + mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' | ||
91 | + cp date '$(DESTDIR)$(BINDIR)/.' | ||
92 | + cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.' | ||
93 | |||
94 | version: $(VERSION_DEPS) | ||
95 | { (type git) >/dev/null 2>&1 && \ | ||
96 | V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ | ||
97 | --abbrev=7 --dirty` || \ | ||
98 | - V=$(VERSION); } && \ | ||
99 | + V='$(VERSION)'; } && \ | ||
100 | printf '%s\n' "$$V" >$@.out | ||
101 | mv $@.out $@ | ||
102 | |||
103 | @@ -529,12 +529,12 @@ leapseconds: $(LEAP_DEPS) | ||
104 | # Arguments to pass to submakes of install_data. | ||
105 | # They can be overridden by later submake arguments. | ||
106 | INSTALLARGS = \ | ||
107 | - BACKWARD=$(BACKWARD) \ | ||
108 | - DESTDIR=$(DESTDIR) \ | ||
109 | + BACKWARD='$(BACKWARD)' \ | ||
110 | + DESTDIR='$(DESTDIR)' \ | ||
111 | LEAPSECONDS='$(LEAPSECONDS)' \ | ||
112 | PACKRATDATA='$(PACKRATDATA)' \ | ||
113 | - TZDIR=$(TZDIR) \ | ||
114 | - YEARISTYPE=$(YEARISTYPE) \ | ||
115 | + TZDIR='$(TZDIR)' \ | ||
116 | + YEARISTYPE='$(YEARISTYPE)' \ | ||
117 | ZIC='$(ZIC)' | ||
118 | |||
119 | # 'make install_data' installs one set of tz binary files. | ||
120 | @@ -558,16 +558,16 @@ right_only: | ||
121 | # You must replace all of $(TZDIR) to switch from not using leap seconds | ||
122 | # to using them, or vice versa. | ||
123 | right_posix: right_only | ||
124 | - rm -fr $(DESTDIR)$(TZDIR)-leaps | ||
125 | - ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ | ||
126 | - $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only | ||
127 | - $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only | ||
128 | + rm -fr '$(DESTDIR)$(TZDIR)-leaps' | ||
129 | + ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \ | ||
130 | + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only | ||
131 | + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only | ||
132 | |||
133 | posix_right: posix_only | ||
134 | - rm -fr $(DESTDIR)$(TZDIR)-posix | ||
135 | - ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ | ||
136 | - $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only | ||
137 | - $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only | ||
138 | + rm -fr '$(DESTDIR)$(TZDIR)-posix' | ||
139 | + ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \ | ||
140 | + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only | ||
141 | + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only | ||
142 | |||
143 | # This obsolescent rule is present for backwards compatibility with | ||
144 | # tz releases 2014g through 2015g. It should go away eventually. | ||
145 | @@ -764,7 +764,7 @@ set-timestamps.out: $(ENCHILADA) | ||
146 | |||
147 | check_public: | ||
148 | $(MAKE) maintainer-clean | ||
149 | - $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL | ||
150 | + $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL | ||
151 | mkdir -p public.dir | ||
152 | for i in $(TDATA) tzdata.zi; do \ | ||
153 | $(zic) -v -d public.dir $$i 2>&1 || exit; \ | ||
154 | diff --git a/NEWS b/NEWS | ||
155 | index bd2bec2..75ab095 100644 | ||
156 | --- a/NEWS | ||
157 | +++ b/NEWS | ||
158 | @@ -1,5 +1,13 @@ | ||
159 | News for the tz database | ||
160 | |||
161 | +Unreleased, experimental changes | ||
162 | + | ||
163 | + Changes to build procedure | ||
164 | + | ||
165 | + The Makefile now quotes values like BACKWARD more carefully when | ||
166 | + passing them to the shell. (Problem reported by Zefram.) | ||
167 | + | ||
168 | + | ||
169 | Release 2017c - 2017-10-20 14:49:34 -0700 | ||
170 | |||
171 | Briefly: | ||
172 | -- | ||
173 | 2.7.4 | ||
174 | |||
diff --git a/meta/recipes-extended/tzcode/files/0002-Port-zdump-to-C90-snprintf.patch b/meta/recipes-extended/tzcode/files/0002-Port-zdump-to-C90-snprintf.patch deleted file mode 100644 index 87afe47694..0000000000 --- a/meta/recipes-extended/tzcode/files/0002-Port-zdump-to-C90-snprintf.patch +++ /dev/null | |||
@@ -1,115 +0,0 @@ | |||
1 | From e231da4fb2beb17c60b4b1a5c276366d6a6e433f Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Mon, 23 Oct 2017 17:58:36 -0700 | ||
4 | Subject: [PATCH] Port zdump to C90 + snprintf | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Problem reported by Jon Skeet in: | ||
10 | https://mm.icann.org/pipermail/tz/2017-October/025362.html | ||
11 | * NEWS: Mention this. | ||
12 | * zdump.c (my_snprintf): New macro or function. If a macro, it is | ||
13 | just snprintf. If a function, it is the same as the old snprintf | ||
14 | static function, with an ATTRIBUTE_FORMAT to pacify modern GCC. | ||
15 | All uses of snprintf changed to use my_snprintf. This way, | ||
16 | installers don’t need to specify -DHAVE_SNPRINTF if they are using | ||
17 | a pre-C99 compiler with a library that has snprintf. | ||
18 | |||
19 | Upstream-Status: Backport | ||
20 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
21 | |||
22 | --- | ||
23 | NEWS | 4 ++++ | ||
24 | zdump.c | 29 ++++++++++++++++------------- | ||
25 | 2 files changed, 20 insertions(+), 13 deletions(-) | ||
26 | |||
27 | diff --git a/NEWS b/NEWS | ||
28 | index 75ab095..dea08b8 100644 | ||
29 | --- a/NEWS | ||
30 | +++ b/NEWS | ||
31 | @@ -7,6 +7,10 @@ Unreleased, experimental changes | ||
32 | The Makefile now quotes values like BACKWARD more carefully when | ||
33 | passing them to the shell. (Problem reported by Zefram.) | ||
34 | |||
35 | + Builders no longer need to specify -DHAVE_SNPRINTF on platforms | ||
36 | + that have snprintf and use pre-C99 compilers. (Problem reported | ||
37 | + by Jon Skeet.) | ||
38 | + | ||
39 | |||
40 | Release 2017c - 2017-10-20 14:49:34 -0700 | ||
41 | |||
42 | diff --git a/zdump.c b/zdump.c | ||
43 | index 8e3bf3e..d4e6084 100644 | ||
44 | --- a/zdump.c | ||
45 | +++ b/zdump.c | ||
46 | @@ -795,12 +795,14 @@ show(timezone_t tz, char *zone, time_t t, bool v) | ||
47 | abbrok(abbr(tmp), zone); | ||
48 | } | ||
49 | |||
50 | -#if !HAVE_SNPRINTF | ||
51 | +#if HAVE_SNPRINTF | ||
52 | +# define my_snprintf snprintf | ||
53 | +#else | ||
54 | # include <stdarg.h> | ||
55 | |||
56 | /* A substitute for snprintf that is good enough for zdump. */ | ||
57 | -static int | ||
58 | -snprintf(char *s, size_t size, char const *format, ...) | ||
59 | +static int ATTRIBUTE_FORMAT((printf, 3, 4)) | ||
60 | +my_snprintf(char *s, size_t size, char const *format, ...) | ||
61 | { | ||
62 | int n; | ||
63 | va_list args; | ||
64 | @@ -839,10 +841,10 @@ format_local_time(char *buf, size_t size, struct tm const *tm) | ||
65 | { | ||
66 | int ss = tm->tm_sec, mm = tm->tm_min, hh = tm->tm_hour; | ||
67 | return (ss | ||
68 | - ? snprintf(buf, size, "%02d:%02d:%02d", hh, mm, ss) | ||
69 | + ? my_snprintf(buf, size, "%02d:%02d:%02d", hh, mm, ss) | ||
70 | : mm | ||
71 | - ? snprintf(buf, size, "%02d:%02d", hh, mm) | ||
72 | - : snprintf(buf, size, "%02d", hh)); | ||
73 | + ? my_snprintf(buf, size, "%02d:%02d", hh, mm) | ||
74 | + : my_snprintf(buf, size, "%02d", hh)); | ||
75 | } | ||
76 | |||
77 | /* Store into BUF, of size SIZE, a formatted UTC offset for the | ||
78 | @@ -877,10 +879,10 @@ format_utc_offset(char *buf, size_t size, struct tm const *tm, time_t t) | ||
79 | mm = off / 60 % 60; | ||
80 | hh = off / 60 / 60; | ||
81 | return (ss || 100 <= hh | ||
82 | - ? snprintf(buf, size, "%c%02ld%02d%02d", sign, hh, mm, ss) | ||
83 | + ? my_snprintf(buf, size, "%c%02ld%02d%02d", sign, hh, mm, ss) | ||
84 | : mm | ||
85 | - ? snprintf(buf, size, "%c%02ld%02d", sign, hh, mm) | ||
86 | - : snprintf(buf, size, "%c%02ld", sign, hh)); | ||
87 | + ? my_snprintf(buf, size, "%c%02ld%02d", sign, hh, mm) | ||
88 | + : my_snprintf(buf, size, "%c%02ld", sign, hh)); | ||
89 | } | ||
90 | |||
91 | /* Store into BUF (of size SIZE) a quoted string representation of P. | ||
92 | @@ -983,15 +985,16 @@ istrftime(char *buf, size_t size, char const *time_fmt, | ||
93 | for (abp = ab; is_alpha(*abp); abp++) | ||
94 | continue; | ||
95 | len = (!*abp && *ab | ||
96 | - ? snprintf(b, s, "%s", ab) | ||
97 | + ? my_snprintf(b, s, "%s", ab) | ||
98 | : format_quoted_string(b, s, ab)); | ||
99 | if (s <= len) | ||
100 | return false; | ||
101 | b += len, s -= len; | ||
102 | } | ||
103 | - formatted_len = (tm->tm_isdst | ||
104 | - ? snprintf(b, s, &"\t\t%d"[show_abbr], tm->tm_isdst) | ||
105 | - : 0); | ||
106 | + formatted_len | ||
107 | + = (tm->tm_isdst | ||
108 | + ? my_snprintf(b, s, &"\t\t%d"[show_abbr], tm->tm_isdst) | ||
109 | + : 0); | ||
110 | } | ||
111 | break; | ||
112 | } | ||
113 | -- | ||
114 | 2.7.4 | ||
115 | |||