apt 0.7.14: do_compile failed with gcc 4.7
apt do_compile failed with gcc 4.7: deb/deblistparser.cc: In member function 'virtual short unsigned int debListParser::VersionHash()': deb/deblistparser.cc:212:13: error: redeclaration of 'char* I' deb/deblistparser.cc:202:22: error: 'const char** I' previously declared here Backport the patch from the upstream would fix the problem, both target and native apt need it. [YOCTO #2488] (From OE-Core rev: 80c1ab1248ff38ba97cf5780fc05ff1321e14e10) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
af3e5039e8
commit
107ec95659
|
@ -0,0 +1,63 @@
|
||||||
|
Fix build errors on gcc 4.7:
|
||||||
|
|
||||||
|
deb/deblistparser.cc: In member function 'virtual short unsigned int debListParser::VersionHash()':
|
||||||
|
deb/deblistparser.cc:212:13: error: redeclaration of 'char* I'
|
||||||
|
deb/deblistparser.cc:202:22: error: 'const char** I' previously declared here
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||||
|
---
|
||||||
|
apt-pkg/deb/deblistparser.cc | 10 +++++-----
|
||||||
|
cmdline/apt-get.cc | 8 ++++----
|
||||||
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
|
||||||
|
--- a/apt-pkg/deb/deblistparser.cc
|
||||||
|
+++ b/apt-pkg/deb/deblistparser.cc
|
||||||
|
@@ -209,18 +209,18 @@ unsigned short debListParser::VersionHash()
|
||||||
|
/* Strip out any spaces from the text, this undoes dpkgs reformatting
|
||||||
|
of certain fields. dpkg also has the rather interesting notion of
|
||||||
|
reformatting depends operators < -> <= */
|
||||||
|
- char *I = S;
|
||||||
|
+ char *J = S;
|
||||||
|
for (; Start != End; Start++)
|
||||||
|
{
|
||||||
|
if (isspace(*Start) == 0)
|
||||||
|
- *I++ = tolower(*Start);
|
||||||
|
+ *J++ = tolower(*Start);
|
||||||
|
if (*Start == '<' && Start[1] != '<' && Start[1] != '=')
|
||||||
|
- *I++ = '=';
|
||||||
|
+ *J++ = '=';
|
||||||
|
if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
|
||||||
|
- *I++ = '=';
|
||||||
|
+ *J++ = '=';
|
||||||
|
}
|
||||||
|
|
||||||
|
- Result = AddCRC16(Result,S,I - S);
|
||||||
|
+ Result = AddCRC16(Result,S,J - S);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result;
|
||||||
|
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
|
||||||
|
--- a/cmdline/apt-get.cc
|
||||||
|
+++ b/cmdline/apt-get.cc
|
||||||
|
@@ -1752,12 +1752,12 @@ bool DoInstall(CommandLine &CmdL)
|
||||||
|
if ((*Cache)[I].Install() == false)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
- const char **J;
|
||||||
|
- for (J = CmdL.FileList + 1; *J != 0; J++)
|
||||||
|
- if (strcmp(*J,I.Name()) == 0)
|
||||||
|
+ const char **K;
|
||||||
|
+ for (K = CmdL.FileList + 1; *K != 0; K++)
|
||||||
|
+ if (strcmp(*K,I.Name()) == 0)
|
||||||
|
break;
|
||||||
|
|
||||||
|
- if (*J == 0) {
|
||||||
|
+ if (*K == 0) {
|
||||||
|
List += string(I.Name()) + " ";
|
||||||
|
VersionsList += string(Cache[I].CandVersion) + "\n";
|
||||||
|
}
|
||||||
|
--
|
||||||
|
1.7.1
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
require apt-native.inc
|
require apt-native.inc
|
||||||
|
|
||||||
PR = "r7"
|
PR = "r8"
|
||||||
|
|
||||||
SRC_URI += "file://nodoc.patch \
|
SRC_URI += "file://nodoc.patch \
|
||||||
file://noconfigure.patch \
|
file://noconfigure.patch \
|
||||||
|
|
|
@ -7,6 +7,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
|
||||||
file://use-host.patch \
|
file://use-host.patch \
|
||||||
file://localefixes.patch \
|
file://localefixes.patch \
|
||||||
file://makerace.patch \
|
file://makerace.patch \
|
||||||
|
file://remove-redeclaration.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
inherit autotools gettext
|
inherit autotools gettext
|
||||||
|
|
|
@ -3,7 +3,7 @@ RDEPENDS_${PN} = "dpkg"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
|
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
|
||||||
require apt.inc
|
require apt.inc
|
||||||
|
|
||||||
PR = "r10"
|
PR = "r11"
|
||||||
|
|
||||||
SRC_URI += "file://nodoc.patch \
|
SRC_URI += "file://nodoc.patch \
|
||||||
file://includes-fix.patch "
|
file://includes-fix.patch "
|
||||||
|
|
Loading…
Reference in New Issue