mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 03:32:12 +02:00
9199c33913
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
(From OE-Core rev: 97403b14765331c8c48bb570c6b98f2809214a9a)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
25 lines
727 B
Diff
25 lines
727 B
Diff
--- 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;
|