Re: [OE-core] [PATCH] apt: Remove workaround patches for no longer supported host distributions
On Wed, May 22, 2019 at 01:04:59PM +0200, Alexander Kanavin wrote: > Our apt version is badly out of date; would you be able to work on an update? >... Not the kind of change I am keen to do on a recipe I don't use in OE. > Alex cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] apt: Remove workaround patches for no longer supported host distributions
Our apt version is badly out of date; would you be able to work on an update? As a starting point, you can take this: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=akanavin/package-version-updates-later&id=e27b40c022654302e4846e47cc7da498a68d9666 Alex On Wed, 22 May 2019 at 12:59, Adrian Bunk wrote: > > All still supported host distributions have gcc >= 4.8. > > Signed-off-by: Adrian Bunk > --- > meta/recipes-devtools/apt/apt-native.inc | 2 - > .../apt/0001-fix-the-gcc-version-check.patch | 74 --- > ...emove-Wsuggest-attribute-from-CFLAGS.patch | 43 --- > 3 files changed, 119 deletions(-) > delete mode 100644 > meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch > delete mode 100644 > meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch > > 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" > > 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 () { > 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..00 > --- a/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch > +++ /dev/null > @@ -1,74 +0,0 @@ > -From 53c5d0982f03fd0e24c4195d6e1e42b9ade9d500 Mon Sep 17 00:00:00 2001 > -From: Roy Li > -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 > > - 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 &F) > -for (std::vector::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 &F2)/*{{{*/ > -for (std::vector::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 &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 > - > 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..00 > --- > a/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 9fdf50d63df08ee65e7d8e62c35f19ac4841bca9 Mon Sep 17 00:00:00 2001 > -From: Roy Li > -Date: Wed, 27 May 2015 09:48:45 +0800 > -Subject: [PATCH] remove Wsuggest-attribute from CXXFLAGS >
[OE-core] [PATCH] apt: Remove workaround patches for no longer supported host distributions
All still supported host distributions have gcc >= 4.8. Signed-off-by: Adrian Bunk --- meta/recipes-devtools/apt/apt-native.inc | 2 - .../apt/0001-fix-the-gcc-version-check.patch | 74 --- ...emove-Wsuggest-attribute-from-CFLAGS.patch | 43 --- 3 files changed, 119 deletions(-) delete mode 100644 meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch delete mode 100644 meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch 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" 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 () { 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..00 --- a/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 53c5d0982f03fd0e24c4195d6e1e42b9ade9d500 Mon Sep 17 00:00:00 2001 -From: Roy Li -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 - 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 &F) -for (std::vector::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 &F2)/*{{{*/ -for (std::vector::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 &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 - 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..00 --- a/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9fdf50d63df08ee65e7d8e62c35f19ac4841bca9 Mon Sep 17 00:00:00 2001 -From: Roy Li -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 - 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-dec