diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2017-08-22 12:20:39 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-23 08:47:03 +0100 |
commit | 7004cb7288a373773d531a14e6643a335eba3db6 (patch) | |
tree | 657fbfcb5dfea12055fa309bf6ef985baf2985e7 /meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch | |
parent | c9a29aa55d47b1c7cbbd8611a92a7383c3d01a3a (diff) | |
download | poky-7004cb7288a373773d531a14e6643a335eba3db6.tar.gz |
apt: Upgrade to 1.2.24
Add new patches for enable builds on hosts that has GCC version
minor than 5 because doesn't support std::array and std::put_time,
those patches could be removed after get rid of Debian8 and Centos7
support.
- gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
- gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
- gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch
The LIC_FILES_CHKSUM changed because the license file now has
style changes in the text remains GPLv2+.
The patch Revert-always-run-dpkg-configure-a-at-the-end-of-our
was updated because now the precision fields use floating
point numbers.
(From OE-Core rev: da99ae14c3a5719b317ff71b8f778a7c987f6158)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch b/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch new file mode 100644 index 0000000000..438de209a2 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch | |||
@@ -0,0 +1,80 @@ | |||
1 | From 7ef2b2dba0e0bee450da3c8450ea782a3e7d6429 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> | ||
3 | Date: Tue, 22 Aug 2017 11:49:01 -0500 | ||
4 | Subject: [PATCH 3/3] Revert "avoid changing the global LC_TIME for Release | ||
5 | writing" | ||
6 | |||
7 | This reverts commit 78e7b683c645e907db12658405a4b201a6243ea8. | ||
8 | |||
9 | After we drop debian8 and centos7 that has gcc < 5 (std::put_time not available) | ||
10 | versions this patch can be remove. | ||
11 | |||
12 | Signed-off-by: Anibal Limon <limon.anibal@gmail.com> | ||
13 | |||
14 | Upstream-Status: Inappropriate [embedded specific] | ||
15 | --- | ||
16 | ftparchive/writer.cc | 29 +++++++++++++++++------------ | ||
17 | 1 file changed, 17 insertions(+), 12 deletions(-) | ||
18 | |||
19 | diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc | ||
20 | index 2596382..e43a643 100644 | ||
21 | --- a/ftparchive/writer.cc | ||
22 | +++ b/ftparchive/writer.cc | ||
23 | @@ -37,7 +37,6 @@ | ||
24 | #include <unistd.h> | ||
25 | #include <ctime> | ||
26 | #include <iostream> | ||
27 | -#include <iomanip> | ||
28 | #include <sstream> | ||
29 | #include <memory> | ||
30 | #include <utility> | ||
31 | @@ -984,29 +983,35 @@ ReleaseWriter::ReleaseWriter(FileFd * const GivenOutput, string const &/*DB*/) : | ||
32 | AddPatterns(_config->FindVector("APT::FTPArchive::Release::Patterns")); | ||
33 | |||
34 | time_t const now = time(NULL); | ||
35 | - auto const posix = std::locale("C.UTF-8"); | ||
36 | |||
37 | - // FIXME: use TimeRFC1123 here? But that uses GMT to satisfy HTTP/1.1 | ||
38 | - std::ostringstream datestr; | ||
39 | - datestr.imbue(posix); | ||
40 | - datestr << std::put_time(gmtime(&now), "%a, %d %b %Y %H:%M:%S UTC"); | ||
41 | + setlocale(LC_TIME, "C"); | ||
42 | + | ||
43 | + char datestr[128]; | ||
44 | + if (strftime(datestr, sizeof(datestr), "%a, %d %b %Y %H:%M:%S UTC", | ||
45 | + gmtime(&now)) == 0) | ||
46 | + { | ||
47 | + datestr[0] = '\0'; | ||
48 | + } | ||
49 | |||
50 | time_t const validuntil = now + _config->FindI("APT::FTPArchive::Release::ValidTime", 0); | ||
51 | - std::ostringstream validstr; | ||
52 | - if (validuntil != now) | ||
53 | + char validstr[128]; | ||
54 | + if (now == validuntil || | ||
55 | + strftime(validstr, sizeof(validstr), "%a, %d %b %Y %H:%M:%S UTC", | ||
56 | + gmtime(&validuntil)) == 0) | ||
57 | { | ||
58 | - datestr.imbue(posix); | ||
59 | - validstr << std::put_time(gmtime(&validuntil), "%a, %d %b %Y %H:%M:%S UTC"); | ||
60 | + validstr[0] = '\0'; | ||
61 | } | ||
62 | |||
63 | + setlocale(LC_TIME, ""); | ||
64 | + | ||
65 | map<string,string> Fields; | ||
66 | Fields["Origin"] = ""; | ||
67 | Fields["Label"] = ""; | ||
68 | Fields["Suite"] = ""; | ||
69 | Fields["Version"] = ""; | ||
70 | Fields["Codename"] = ""; | ||
71 | - Fields["Date"] = datestr.str(); | ||
72 | - Fields["Valid-Until"] = validstr.str(); | ||
73 | + Fields["Date"] = datestr; | ||
74 | + Fields["Valid-Until"] = validstr; | ||
75 | Fields["Architectures"] = ""; | ||
76 | Fields["Components"] = ""; | ||
77 | Fields["Description"] = ""; | ||
78 | -- | ||
79 | 2.1.4 | ||
80 | |||