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:44:41 +0100 |
commit | da99ae14c3a5719b317ff71b8f778a7c987f6158 (patch) | |
tree | 8d7155fe87b1e5303e16267283383cf478603465 /meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch | |
parent | dc1ae641435999095e8759812b096fec1f28c90d (diff) | |
download | openembedded-core-contrib-da99ae14c3a5719b317ff71b8f778a7c987f6158.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.
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-use-de-localed-std-put_time-instead-rolling-o.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch b/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch new file mode 100644 index 0000000000..088a66a3c8 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch @@ -0,0 +1,46 @@ +From c72ef9b6ae83a0a2fbbefd5c050335f65f0d2bc9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> +Date: Tue, 22 Aug 2017 11:48:46 -0500 +Subject: [PATCH 2/3] Revert "use de-localed std::put_time instead rolling our + own" + +This reverts commit 4ed2a17ab4334f019c00512aa54a162f0bf083c4. + +After we drop debian8 and centos7 that has gcc < 5 (std::put_time not available) +versions this patch can be remove. + +Signed-off-by: Anibal Limon <limon.anibal@gmail.com> + +Upstream-Status: Inappropriate [embedded specific] +--- + apt-pkg/contrib/strutl.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc +index c2ff01d..e9ef2be 100644 +--- a/apt-pkg/contrib/strutl.cc ++++ b/apt-pkg/contrib/strutl.cc +@@ -760,11 +760,15 @@ string TimeRFC1123(time_t Date) + if (gmtime_r(&Date, &Conv) == NULL) + return ""; + +- auto const posix = std::locale::classic(); +- std::ostringstream datestr; +- datestr.imbue(posix); +- datestr << std::put_time(&Conv, "%a, %d %b %Y %H:%M:%S GMT"); +- return datestr.str(); ++ char Buf[300]; ++ const char *Day[] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"}; ++ const char *Month[] = {"Jan","Feb","Mar","Apr","May","Jun","Jul", ++ "Aug","Sep","Oct","Nov","Dec"}; ++ ++ snprintf(Buf, sizeof(Buf), "%s, %02i %s %i %02i:%02i:%02i GMT",Day[Conv.tm_wday], ++ Conv.tm_mday,Month[Conv.tm_mon],Conv.tm_year+1900,Conv.tm_hour, ++ Conv.tm_min,Conv.tm_sec); ++ return Buf; + } + /*}}}*/ + // ReadMessages - Read messages from the FD /*{{{*/ +-- +2.1.4 + |