summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-22 13:58:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-27 17:06:34 +0100
commit03c92bdf9cd53fe0451146e2a18466c3b6e6afa3 (patch)
treed90502b32eb43f81e5a450629c2fe462760c08a7 /meta/recipes-devtools
parentc6dbd6c52857eb1e59246f337a2d4ab0f3990453 (diff)
downloadpoky-03c92bdf9cd53fe0451146e2a18466c3b6e6afa3.tar.gz
apt: Remove workaround patches for no longer supported host distributions
All still supported host distributions have gcc >= 4.8. (From OE-Core rev: c8eeb487d09cc4bd0f637260dd01d0982745038f) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/apt/apt-native.inc2
-rw-r--r--meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch74
-rw-r--r--meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch43
3 files changed, 0 insertions, 119 deletions
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc
index ef232c1eb6..d826786329 100644
--- a/meta/recipes-devtools/apt/apt-native.inc
+++ b/meta/recipes-devtools/apt/apt-native.inc
@@ -7,8 +7,6 @@ USE_NLS = "yes"
7 7
8SRC_URI += "file://db_linking_hack.patch \ 8SRC_URI += "file://db_linking_hack.patch \
9 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ 9 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \
10 file://0001-remove-Wsuggest-attribute-from-CFLAGS.patch \
11 file://0001-fix-the-gcc-version-check.patch \
12" 10"
13 11
14python do_install () { 12python do_install () {
diff --git a/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch b/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
deleted file mode 100644
index 3ac92462c5..0000000000
--- a/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 53c5d0982f03fd0e24c4195d6e1e42b9ade9d500 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Wed, 27 May 2015 14:30:28 +0800
4Subject: [PATCH] fix the gcc version check
5
6Upstream-Status: pending
7
8"GCC diagnostic push" is gcc 4.6 feature, gcc 4.4.7 on centos did not know it
9
10Signed-off-by: Roy Li <rongqing.li@windriver.com>
11---
12 apt-pkg/contrib/macros.h | 2 +-
13 apt-pkg/deb/debsrcrecords.cc | 4 ++--
14 apt-pkg/srcrecords.cc | 4 ++--
15 3 files changed, 5 insertions(+), 5 deletions(-)
16
17diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
18index 2727fd8..0ecae50 100644
19--- a/apt-pkg/contrib/macros.h
20+++ b/apt-pkg/contrib/macros.h
21@@ -136,7 +136,7 @@
22 #endif
23 #endif
24
25-#if __GNUC__ >= 4
26+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
27 #define APT_IGNORE_DEPRECATED_PUSH \
28 _Pragma("GCC diagnostic push") \
29 _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
30diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
31index e8295de..40160b2 100644
32--- a/apt-pkg/deb/debsrcrecords.cc
33+++ b/apt-pkg/deb/debsrcrecords.cc
34@@ -139,13 +139,13 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &F)
35 for (std::vector<pkgSrcRecords::File2>::const_iterator f2 = F2.begin(); f2 != F2.end(); ++f2)
36 {
37 pkgSrcRecords::File2 f;
38-#if __GNUC__ >= 4
39+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
40 #pragma GCC diagnostic push
41 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
42 #endif
43 f.MD5Hash = f2->MD5Hash;
44 f.Size = f2->Size;
45-#if __GNUC__ >= 4
46+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
47 #pragma GCC diagnostic pop
48 #endif
49 f.Path = f2->Path;
50diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
51index 53d7e60..1484828 100644
52--- a/apt-pkg/srcrecords.cc
53+++ b/apt-pkg/srcrecords.cc
54@@ -157,7 +157,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/
55 for (std::vector<pkgSrcRecords::File>::const_iterator f = F.begin(); f != F.end(); ++f)
56 {
57 pkgSrcRecords::File2 f2;
58-#if __GNUC__ >= 4
59+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
60 #pragma GCC diagnostic push
61 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
62 #endif
63@@ -165,7 +165,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/
64 f2.Size = f->Size;
65 f2.Hashes.push_back(HashString("MD5Sum", f->MD5Hash));
66 f2.FileSize = f->Size;
67-#if __GNUC__ >= 4
68+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
69 #pragma GCC diagnostic pop
70 #endif
71 f2.Path = f->Path;
72--
732.1.4
74
diff --git a/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch b/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
deleted file mode 100644
index 47870e3c8b..0000000000
--- a/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 9fdf50d63df08ee65e7d8e62c35f19ac4841bca9 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Wed, 27 May 2015 09:48:45 +0800
4Subject: [PATCH] remove Wsuggest-attribute from CXXFLAGS
5
6Upstream-Status: Inappropriate
7
8Wsuggest-attribute is GCC 4.6 feature, centos6 is using GCC
94.4.7 which unknown this flag, so remove it from CXXFLAGS
10
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12---
13 buildlib/environment.mak.in | 1 -
14 test/libapt/makefile | 1 -
15 2 files changed, 2 deletions(-)
16
17diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
18index 9620722..c344d01 100644
19--- a/buildlib/environment.mak.in
20+++ b/buildlib/environment.mak.in
21@@ -14,7 +14,6 @@ CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra
22 CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations
23 CXXFLAGS+= -Wctor-dtor-privacy -Wdisabled-optimization -Winit-self -Wmissing-include-dirs -Wnoexcept -Wsign-promo -Wundef
24 # suggests methods which already have such an attribute
25-#CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn
26 # sanitize options to be enabled for testing
27 #CXXFLAGS+= -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr
28 # a bit too pedantic to be run by default
29diff --git a/test/libapt/makefile b/test/libapt/makefile
30index 5ff9cf6..c5b5190 100644
31--- a/test/libapt/makefile
32+++ b/test/libapt/makefile
33@@ -40,7 +40,6 @@ CXXFLAGS += -pthread
34 # disable some flags for gtest again
35 CXXFLAGS+= -Wno-missing-declarations
36 CXXFLAGS+= -Wno-missing-field-initializers
37-CXXFLAGS+= -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wno-suggest-attribute=noreturn
38 CXXFLAGS+= -Wno-undef
39
40 # All Google Test headers. Usually you shouldn't change this definition.
41--
422.1.4
43