mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-08 17:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

util-linux: Fix ptest builds on musl

Browse Source 
musl doesnt implement error() API, hence provide one

(From OE-Core rev: 4c7cb1f34bdb030333d83e445b5df5d06bef478f)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2015-12-19 23:37:14 +00:00
committed by Richard Purdie
parent 77825f8ae7
commit 3e7d7abe91
2 changed files with 93 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
meta/recipes-core/util-linux/util-linux/uuid-test-error-api.patch Normal file
View File

@@ -0,0 +1,92 @@
This patch adds error() API implementation for non-glibc system C libs
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: util-linux-2.27.1/tests/helpers/test_uuidd.c
===================================================================
--- util-linux-2.27.1.orig/tests/helpers/test_uuidd.c
+++ util-linux-2.27.1/tests/helpers/test_uuidd.c
@@ -23,7 +23,6 @@
*
* make uuidd uuidgen localstatedir=/var
*/
-#include <error.h>
#include <libgen.h>
#include <pthread.h>
#include <stdio.h>
@@ -39,6 +38,17 @@
#include "xalloc.h"
#include "strutils.h"
+#ifdef __GLIBC__
+#include <error.h>
+#else
+extern void (*error_print_progname)(void);
+extern unsigned int error_message_count;
+extern int error_one_per_line;
+
+void error(int, int, const char *, ...);
+void error_at_line(int, int, const char *, unsigned int, const char *, ...);
+#endif
+
#define LOG(level,args) if (loglev >= level) { fprintf args; }
size_t nprocesses = 4;
@@ -257,6 +267,56 @@ static void object_dump(size_t idx, obje
fprintf(stderr, "}\n");
}
+#ifndef __GLIBC__
+extern char *__progname;
+
+void (*error_print_progname)(void) = 0;
+unsigned int error_message_count = 0;
+int error_one_per_line = 0;
+
+static void eprint(int status, int e, const char *file, unsigned int line, const char *fmt, va_list ap)
+{
+ if (file && error_one_per_line) {
+ static const char *oldfile;
+ static unsigned int oldline;
+ if (line == oldline && strcmp(file, oldfile) == 0)
+ return;
+ oldfile = file;
+ oldline = line;
+ }
+ if (error_print_progname)
+ error_print_progname();
+ else
+ fprintf(stderr, "%s: ", __progname);
+ if (file)
+ fprintf(stderr, "%s:%u: ", file, line);
+ vfprintf(stderr, fmt, ap);
+ if (e)
+ fprintf(stderr, ": %s", strerror(e));
+ putc('\n', stderr);
+ fflush(stderr);
+ error_message_count++;
+ if (status)
+ exit(status);
+}
+
+void error(int status, int e, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap,fmt);
+ eprint(status, e, 0, 0, fmt, ap);
+ va_end(ap);
+}
+
+void error_at_line(int status, int e, const char *file, unsigned int line, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap,fmt);
+ eprint(status, e, file, line, fmt, ap);
+ va_end(ap);
+}
+#endif /* __GLIBC__ */
+
int main(int argc, char *argv[])
{
size_t i, nfailed = 0, nignored = 0;

1
meta/recipes-core/util-linux/util-linux_2.27.1.bb
View File

@@ -19,6 +19,7 @@ SRC_URI += "file://util-linux-ng-2.16-mount_lock_path.patch \
file://avoid_unsupported_grep_opts.patch \
file://display_testname_for_subtest.patch \
file://avoid_parallel_tests.patch \
file://uuid-test-error-api.patch \
"
SRC_URI[md5sum] = "3cd2698d1363a2c64091c2dadc974647"
SRC_URI[sha256sum] = "0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290"