diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2013-03-01 17:06:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-05 12:29:45 +0000 |
commit | 97403b14765331c8c48bb570c6b98f2809214a9a (patch) | |
tree | 15dfbce0de9579179a941ad36d4bfa9f51451ce6 /meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch | |
parent | 59cd32a6661d76ee070810823614eb797d6cc153 (diff) | |
download | openembedded-core-contrib-97403b14765331c8c48bb570c6b98f2809214a9a.tar.gz |
apt: upgrade to 0.9.7.7
bb files: remove invalid config.sub/config.guess files (autotools will
generate the correct files)
allocate-larger-memory.patch: not needed anymore
fix-gcc-4.6-null-not-defined.patch: added
- include header that defines NULL
includes-fix.patch: not needed anymore
localefixes.patch: removed
- not necessary anymore (no compiling errors)
makerace.patch: adapted to the new version
no-ko-translation.patch: adapted to the new version
no-nls-dpkg.patch: added
- fix build without nls
noconfigure.patch: adapted to the new version
nodoc.patch: adapted to the new version (apply patch on all cases
because the doc generation needs docbook-xsl)
remove-redeclaration.patch: not needed anymore
truncate-filename.patch: moved
use-host.patch: adapted to the new version
no-curl.patch: adapted to the new version
disable-configure-in-makefile.patch: added
- do not run configure at do_compile
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch new file mode 100644 index 0000000000..f1dd5fd05b --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch @@ -0,0 +1,24 @@ +--- a/apt-pkg/deb/dpkgpm.cc ++++ b/apt-pkg/deb/dpkgpm.cc +@@ -42,6 +42,12 @@ + #include <apti18n.h> + /*}}}*/ + ++#ifdef USE_NLS ++#define _dpkg(x) dgettext("dpkg", x) ++#else ++#define _dpkg(x) x ++#endif ++ + using namespace std; + + namespace +@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const + } + + // check if its not a follow up error +- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); ++ const char *needle = _dpkg("dependency problems - leaving unconfigured"); + if(strstr(errormsg, needle) != NULL) { + std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; + return; |