diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-23 23:24:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-21 12:04:16 +0100 |
commit | 08d70734d5636f7b8658e5a5457c2a95c9fb2c46 (patch) | |
tree | ea6f63fd70ae48f4e406582aa15015b4c87f82fc | |
parent | 164a4d1bacf93a82ee13591fb4d3c6563bb9890f (diff) | |
download | poky-08d70734d5636f7b8658e5a5457c2a95c9fb2c46.tar.gz |
apt: Fix locale header and hardcoded libname issues
apt wasn't building on modern libc/compiler combinations due to missing
header includes.
The libcpp version was also being hardcoded, this patch generates it
dynamically to work on different host systems which no longer have
this.
(From OE-Core rev: 4bcffbcd05c86903fbdf47bb46bf1a52b888dfeb)
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>
-rw-r--r-- | meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch | 91 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-native.inc | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-native_0.7.14.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-package.inc | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt_0.7.14.bb | 2 |
6 files changed, 104 insertions, 10 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch b/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch new file mode 100644 index 0000000000..80252732e2 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch | |||
@@ -0,0 +1,91 @@ | |||
1 | Add in missing header includes to resolve compile failures with recent | ||
2 | compiler/glibc combinations. | ||
3 | |||
4 | Upstream-Status: Inappropriate [Resolved upstream] | ||
5 | |||
6 | RP 2011/11/23 | ||
7 | |||
8 | Index: apt-0.7.14/apt-pkg/init.cc | ||
9 | =================================================================== | ||
10 | --- apt-0.7.14.orig/apt-pkg/init.cc 2011-11-23 22:48:53.544637868 +0000 | ||
11 | +++ apt-0.7.14/apt-pkg/init.cc 2011-11-23 22:48:59.456638260 +0000 | ||
12 | @@ -16,6 +16,7 @@ | ||
13 | #include <config.h> | ||
14 | #include <cstdlib> | ||
15 | #include <sys/stat.h> | ||
16 | +#include <locale> | ||
17 | /*}}}*/ | ||
18 | |||
19 | #define Stringfy_(x) # x | ||
20 | Index: apt-0.7.14/cmdline/apt-cache.cc | ||
21 | =================================================================== | ||
22 | --- apt-0.7.14.orig/cmdline/apt-cache.cc 2011-11-23 22:53:29.048631067 +0000 | ||
23 | +++ apt-0.7.14/cmdline/apt-cache.cc 2011-11-23 22:54:15.784616212 +0000 | ||
24 | @@ -32,6 +32,7 @@ | ||
25 | #include <apti18n.h> | ||
26 | |||
27 | #include <locale.h> | ||
28 | +#include <locale> | ||
29 | #include <iostream> | ||
30 | #include <unistd.h> | ||
31 | #include <errno.h> | ||
32 | Index: apt-0.7.14/cmdline/apt-cdrom.cc | ||
33 | =================================================================== | ||
34 | --- apt-0.7.14.orig/cmdline/apt-cdrom.cc 2011-11-23 22:53:29.064631096 +0000 | ||
35 | +++ apt-0.7.14/cmdline/apt-cdrom.cc 2011-11-23 22:53:57.616630261 +0000 | ||
36 | @@ -27,6 +27,7 @@ | ||
37 | //#include "indexcopy.h" | ||
38 | |||
39 | #include <locale.h> | ||
40 | +#include <locale> | ||
41 | #include <iostream> | ||
42 | #include <fstream> | ||
43 | #include <vector> | ||
44 | Index: apt-0.7.14/cmdline/apt-config.cc | ||
45 | =================================================================== | ||
46 | --- apt-0.7.14.orig/cmdline/apt-config.cc 2011-11-23 22:50:16.796635352 +0000 | ||
47 | +++ apt-0.7.14/cmdline/apt-config.cc 2011-11-23 22:50:25.640633906 +0000 | ||
48 | @@ -27,6 +27,7 @@ | ||
49 | #include <locale.h> | ||
50 | #include <iostream> | ||
51 | #include <string> | ||
52 | +#include <locale> | ||
53 | /*}}}*/ | ||
54 | using namespace std; | ||
55 | |||
56 | Index: apt-0.7.14/cmdline/apt-extracttemplates.cc | ||
57 | =================================================================== | ||
58 | --- apt-0.7.14.orig/cmdline/apt-extracttemplates.cc 2011-11-23 22:53:29.080631084 +0000 | ||
59 | +++ apt-0.7.14/cmdline/apt-extracttemplates.cc 2011-11-23 22:53:38.304630439 +0000 | ||
60 | @@ -39,6 +39,7 @@ | ||
61 | #include <config.h> | ||
62 | #include <apti18n.h> | ||
63 | #include "apt-extracttemplates.h" | ||
64 | +#include <locale> | ||
65 | /*}}}*/ | ||
66 | |||
67 | using namespace std; | ||
68 | Index: apt-0.7.14/cmdline/apt-get.cc | ||
69 | =================================================================== | ||
70 | --- apt-0.7.14.orig/cmdline/apt-get.cc 2011-11-23 22:53:29.096631090 +0000 | ||
71 | +++ apt-0.7.14/cmdline/apt-get.cc 2011-11-23 22:53:49.368629452 +0000 | ||
72 | @@ -48,6 +48,7 @@ | ||
73 | |||
74 | #include <set> | ||
75 | #include <locale.h> | ||
76 | +#include <locale> | ||
77 | #include <langinfo.h> | ||
78 | #include <fstream> | ||
79 | #include <termios.h> | ||
80 | Index: apt-0.7.14/cmdline/apt-sortpkgs.cc | ||
81 | =================================================================== | ||
82 | --- apt-0.7.14.orig/cmdline/apt-sortpkgs.cc 2011-11-23 22:52:03.872640247 +0000 | ||
83 | +++ apt-0.7.14/cmdline/apt-sortpkgs.cc 2011-11-23 22:52:10.880638611 +0000 | ||
84 | @@ -27,6 +27,7 @@ | ||
85 | |||
86 | #include <locale.h> | ||
87 | #include <unistd.h> | ||
88 | +#include <locale> | ||
89 | /*}}}*/ | ||
90 | |||
91 | using namespace std; | ||
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc index b16f99e93c..ddaeaf9251 100644 --- a/meta/recipes-devtools/apt/apt-native.inc +++ b/meta/recipes-devtools/apt/apt-native.inc | |||
@@ -40,10 +40,11 @@ do_install_base () { | |||
40 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ | 40 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ |
41 | 41 | ||
42 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` | 42 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` |
43 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ | 43 | eval `cat environment.mak | grep ^LIBSTDCPP_VER | sed -e's, = ,=,'` |
44 | ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so | 44 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ |
45 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ | 45 | ln -sf libapt-pkg$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-pkg.so |
46 | ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so | 46 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ |
47 | ln -sf libapt-inst$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-inst.so | ||
47 | 48 | ||
48 | install -d ${D}${libdir}/apt/methods | 49 | install -d ${D}${libdir}/apt/methods |
49 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ | 50 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ |
diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb index c82d606ebe..37368acbc2 100644 --- a/meta/recipes-devtools/apt/apt-native_0.7.14.bb +++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require apt-native.inc | 1 | require apt-native.inc |
2 | 2 | ||
3 | PR = "r5" | 3 | PR = "r6" |
4 | 4 | ||
5 | SRC_URI += "file://nodoc.patch \ | 5 | SRC_URI += "file://nodoc.patch \ |
6 | file://noconfigure.patch \ | 6 | file://noconfigure.patch \ |
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc index 2e3be3885b..1909e3b197 100644 --- a/meta/recipes-devtools/apt/apt-package.inc +++ b/meta/recipes-devtools/apt/apt-package.inc | |||
@@ -78,10 +78,11 @@ do_install () { | |||
78 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ | 78 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ |
79 | 79 | ||
80 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` | 80 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` |
81 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ | 81 | eval `cat environment.mak | grep ^LIBSTDCPP_VER | sed -e's, = ,=,'` |
82 | ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so | 82 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ |
83 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ | 83 | ln -sf libapt-pkg$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-pkg.so |
84 | ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so | 84 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ |
85 | ln -sf libapt-inst$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-inst.so | ||
85 | 86 | ||
86 | install -d ${D}${libdir}/apt/methods | 87 | install -d ${D}${libdir}/apt/methods |
87 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ | 88 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ |
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 546683f9bc..9d3268de6b 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc | |||
@@ -5,6 +5,7 @@ SECTION = "base" | |||
5 | SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ | 5 | SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ |
6 | file://no-ko-translation.patch \ | 6 | file://no-ko-translation.patch \ |
7 | file://use-host.patch \ | 7 | file://use-host.patch \ |
8 | file://localefixes.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | inherit autotools gettext | 11 | inherit autotools gettext |
diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb index 93eebe9502..bd1116f3d5 100644 --- a/meta/recipes-devtools/apt/apt_0.7.14.bb +++ b/meta/recipes-devtools/apt/apt_0.7.14.bb | |||
@@ -3,7 +3,7 @@ RDEPENDS_${PN} = "dpkg" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" | 3 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" |
4 | require apt.inc | 4 | require apt.inc |
5 | 5 | ||
6 | PR = "r8" | 6 | PR = "r9" |
7 | 7 | ||
8 | SRC_URI += "file://nodoc.patch \ | 8 | SRC_URI += "file://nodoc.patch \ |
9 | file://includes-fix.patch " | 9 | file://includes-fix.patch " |