shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

journal: systemd v38 fails to build on big-endians

Browse Source 
Hi,

during the builds for Fedora/s390x I've found that systemd v38 fails to
build on big-endian platforms.

...
make[2]: Entering directory `/root/systemd'
  CC     src/journal/libsystemd_journal_la-sd-journal.lo
src/journal/sd-journal.c: In function 'init_location':
src/journal/sd-journal.c:69:22: error: incompatible types when
initializing type 'long unsigned int' using type 'sd_id128_t'
src/journal/sd-journal.c:69:20: error: incompatible types when assigning
to type 'sd_id128_t' from type 'long unsigned int'
make[2]: *** [src/journal/libsystemd_journal_la-sd-journal.lo] Error 1

I see the problem in using le64toh() on the 16 bytes boot_id structure
in init_location()

Please see
http://s390.koji.fedoraproject.org/koji/taskinfo?taskID=544375 for a
full build log and attachment for a proposed fix.

With regards

Dan
This commit is contained in:
Dan Horák 2012-01-19 12:42:53 +01:00 committed by Lennart Poettering
parent d1f262fa46
commit ce3fd7e72a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/journal/sd-journal.c
View File

@ -66,7 +66,7 @@ static void init_location(Location *l, JournalFile *f, Object *o) {
l->seqnum_id = f->header->seqnum_id; l->seqnum_id = f->header->seqnum_id;
l->realtime = le64toh(o->entry.realtime); l->realtime = le64toh(o->entry.realtime);
l->monotonic = le64toh(o->entry.monotonic); l->monotonic = le64toh(o->entry.monotonic);
l->boot_id = le64toh(o->entry.boot_id); l->boot_id = o->entry.boot_id;
l->xor_hash = le64toh(o->entry.xor_hash); l->xor_hash = le64toh(o->entry.xor_hash);
l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true; l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true;