mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 12:32:12 +02:00
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>
This commit is contained in:
Adrian Bunk
committed by
Richard Purdie
Richard Purdie
parent
c6dbd6c528
commit
03c92bdf9c
@@ -7,8 +7,6 @@ USE_NLS = "yes"
|
||||
|
||||
SRC_URI += "file://db_linking_hack.patch \
|
||||
file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \
|
||||
file://0001-remove-Wsuggest-attribute-from-CFLAGS.patch \
|
||||
file://0001-fix-the-gcc-version-check.patch \
|
||||
"
|
||||
|
||||
python do_install () {
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From 53c5d0982f03fd0e24c4195d6e1e42b9ade9d500 Mon Sep 17 00:00:00 2001
|
||||
From: Roy Li <rongqing.li@windriver.com>
|
||||
Date: Wed, 27 May 2015 14:30:28 +0800
|
||||
Subject: [PATCH] fix the gcc version check
|
||||
|
||||
Upstream-Status: pending
|
||||
|
||||
"GCC diagnostic push" is gcc 4.6 feature, gcc 4.4.7 on centos did not know it
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
---
|
||||
apt-pkg/contrib/macros.h | 2 +-
|
||||
apt-pkg/deb/debsrcrecords.cc | 4 ++--
|
||||
apt-pkg/srcrecords.cc | 4 ++--
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
|
||||
index 2727fd8..0ecae50 100644
|
||||
--- a/apt-pkg/contrib/macros.h
|
||||
+++ b/apt-pkg/contrib/macros.h
|
||||
@@ -136,7 +136,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#if __GNUC__ >= 4
|
||||
+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
|
||||
#define APT_IGNORE_DEPRECATED_PUSH \
|
||||
_Pragma("GCC diagnostic push") \
|
||||
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
|
||||
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
|
||||
index e8295de..40160b2 100644
|
||||
--- a/apt-pkg/deb/debsrcrecords.cc
|
||||
+++ b/apt-pkg/deb/debsrcrecords.cc
|
||||
@@ -139,13 +139,13 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &F)
|
||||
for (std::vector<pkgSrcRecords::File2>::const_iterator f2 = F2.begin(); f2 != F2.end(); ++f2)
|
||||
{
|
||||
pkgSrcRecords::File2 f;
|
||||
-#if __GNUC__ >= 4
|
||||
+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
#endif
|
||||
f.MD5Hash = f2->MD5Hash;
|
||||
f.Size = f2->Size;
|
||||
-#if __GNUC__ >= 4
|
||||
+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
f.Path = f2->Path;
|
||||
diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
|
||||
index 53d7e60..1484828 100644
|
||||
--- a/apt-pkg/srcrecords.cc
|
||||
+++ b/apt-pkg/srcrecords.cc
|
||||
@@ -157,7 +157,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/
|
||||
for (std::vector<pkgSrcRecords::File>::const_iterator f = F.begin(); f != F.end(); ++f)
|
||||
{
|
||||
pkgSrcRecords::File2 f2;
|
||||
-#if __GNUC__ >= 4
|
||||
+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
#endif
|
||||
@@ -165,7 +165,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/
|
||||
f2.Size = f->Size;
|
||||
f2.Hashes.push_back(HashString("MD5Sum", f->MD5Hash));
|
||||
f2.FileSize = f->Size;
|
||||
-#if __GNUC__ >= 4
|
||||
+#if __GNUC__ >= 4 + (6 >= __GNUC_MINOR__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
f2.Path = f->Path;
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From 9fdf50d63df08ee65e7d8e62c35f19ac4841bca9 Mon Sep 17 00:00:00 2001
|
||||
From: Roy Li <rongqing.li@windriver.com>
|
||||
Date: Wed, 27 May 2015 09:48:45 +0800
|
||||
Subject: [PATCH] remove Wsuggest-attribute from CXXFLAGS
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
Wsuggest-attribute is GCC 4.6 feature, centos6 is using GCC
|
||||
4.4.7 which unknown this flag, so remove it from CXXFLAGS
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
---
|
||||
buildlib/environment.mak.in | 1 -
|
||||
test/libapt/makefile | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
|
||||
index 9620722..c344d01 100644
|
||||
--- a/buildlib/environment.mak.in
|
||||
+++ b/buildlib/environment.mak.in
|
||||
@@ -14,7 +14,6 @@ CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra
|
||||
CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations
|
||||
CXXFLAGS+= -Wctor-dtor-privacy -Wdisabled-optimization -Winit-self -Wmissing-include-dirs -Wnoexcept -Wsign-promo -Wundef
|
||||
# suggests methods which already have such an attribute
|
||||
-#CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn
|
||||
# sanitize options to be enabled for testing
|
||||
#CXXFLAGS+= -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr
|
||||
# a bit too pedantic to be run by default
|
||||
diff --git a/test/libapt/makefile b/test/libapt/makefile
|
||||
index 5ff9cf6..c5b5190 100644
|
||||
--- a/test/libapt/makefile
|
||||
+++ b/test/libapt/makefile
|
||||
@@ -40,7 +40,6 @@ CXXFLAGS += -pthread
|
||||
# disable some flags for gtest again
|
||||
CXXFLAGS+= -Wno-missing-declarations
|
||||
CXXFLAGS+= -Wno-missing-field-initializers
|
||||
-CXXFLAGS+= -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wno-suggest-attribute=noreturn
|
||||
CXXFLAGS+= -Wno-undef
|
||||
|
||||
# All Google Test headers. Usually you shouldn't change this definition.
|
||||
--
|
||||
2.1.4
|
||||
|
||||
Reference in New Issue
Block a user