Skip to contentSkip to conversation

apt: Remove workarounds for host gcc < 5

PATCH In review Adrian Bunk 2 participants 3 messages May 12, 2020 – May 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 apt: Remove workarounds for host gcc < 5

---
 .../recipes-devtools/apt/apt-native_1.2.31.bb |  4 +-
 ...nging-the-global-LC_TIME-for-Release.patch | 80 -------------------
 ...caled-std-put_time-instead-rolling-o.patch | 46 -----------
 ...ntrib-strutl.cc-Include-array-header.patch | 33 --------
 4 files changed, 1 insertion(+), 162 deletions(-)
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch
meta/recipes-devtools/apt/apt-native_1.2.31.bb +1 -3
index 5b16b503d5..2952c21017 100644
@@ -2,6 +2,4 @@ require apt-native.inc
 
 SRC_URI += "file://noconfigure.patch \
             file://no-curl.patch \
-            file://gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch \
-            file://gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch \
-            file://gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch"
+"
meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch deleted +0 -80

80 lines not on this page · raw message

meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch deleted +0 -46

46 lines not on this page · raw message

meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch deleted +0 -33
deleted file mode 100644
index cb32591876..0000000000
@@ -1,33 +0,0 @@
-From ff8562f7724c4db4b83635af9e627f3495222327 Mon Sep 17 00:00:00 2001
-From: Anibal Limon <[email protected]>
-Date: Tue, 22 Aug 2017 04:41:31 -0500
-Subject: [PATCH 1/3] apt-pkg/contrib/strutl.cc: Include array header
-
-If GCC version is less than 5 the array header needs to be included
-to support std::array.
-
-After we drop debian8 and centos7 that has gcc < 5 versions this patch
-can be remove.
-
-Signed-off-by: Anibal Limon <[email protected]>
-
-Upstream-Status: Inappropriate [embedded specific]
----
- apt-pkg/contrib/strutl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
-index 60d0ca8..c2ff01d 100644
---- a/apt-pkg/contrib/strutl.cc
-+++ b/apt-pkg/contrib/strutl.cc
-@@ -27,6 +27,7 @@
- #include <sstream>
- #include <string>
- #include <vector>
-+#include <array>
- 
- #include <stddef.h>
- #include <stdlib.h>
--- 
-2.1.4
-
Signature · 1 line
2.17.1
#1 lore raw
Quoted 16 lines · Adrian Bunk
---
 .../recipes-devtools/apt/apt-native_1.2.31.bb |  4 +-
 ...nging-the-global-LC_TIME-for-Release.patch | 80 -------------------
 ...caled-std-put_time-instead-rolling-o.patch | 46 -----------
 ...ntrib-strutl.cc-Include-array-header.patch | 33 --------
 4 files changed, 1 insertion(+), 162 deletions(-)
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch
meta/recipes-devtools/apt/apt-native_1.2.31.bb +0 -0
index 5b16b503d5..2952c21017 100644

meta/recipes-devtools/apt/apt-native_1.2.31.bb require apt-native.inc · line 5

Quoted 7 lines
meta/recipes-devtools/apt/apt-native_1.2.31.bb +1 -3
@@ -2,6 +2,4 @@ require apt-native.inc
 
 SRC_URI += "file://noconfigure.patch \
             file://no-curl.patch \
-            file://gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch \
-            file://gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch \
-            file://gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch"
+"

I think part of this is causing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1892

?

(the selftests in that build run also saw it)

Cheers,

Richard

#2 lore raw
Quoted 27 lines · Richard Purdie
Quoted 16 lines · Adrian Bunk
---
 .../recipes-devtools/apt/apt-native_1.2.31.bb |  4 +-
 ...nging-the-global-LC_TIME-for-Release.patch | 80 -------------------
 ...caled-std-put_time-instead-rolling-o.patch | 46 -----------
 ...ntrib-strutl.cc-Include-array-header.patch | 33 --------
 4 files changed, 1 insertion(+), 162 deletions(-)
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
 delete mode 100644 meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch
meta/recipes-devtools/apt/apt-native_1.2.31.bb +0 -0
index 5b16b503d5..2952c21017 100644

meta/recipes-devtools/apt/apt-native_1.2.31.bb require apt-native.inc · line 5

Quoted 7 lines
meta/recipes-devtools/apt/apt-native_1.2.31.bb +1 -3
@@ -2,6 +2,4 @@ require apt-native.inc
 
 SRC_URI += "file://noconfigure.patch \
             file://no-curl.patch \
-            file://gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch \
-            file://gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch \
-            file://gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch"
+"

I think part of this is causing:

Quoted 4 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1892

?
...

I cannot reproduce it, but I can see what is likely causing it. Patch will come in a few minutes.

Quoted 3 lines

Cheers,

Richard

cu
Adrian