After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 787248 - Fix preprocessor syntax for BE builds
Fix preprocessor syntax for BE builds
Status: RESOLVED FIXED
Product: evince
Classification: Core
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: Evince Maintainers
Evince Maintainers
: 787086 (view as bug list)
Depends on:
Blocks:
 
 
Reported: 2017-09-04 12:21 UTC by Iain Lane
Modified: 2017-09-04 14:23 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Fix preprocessor syntax for BE builds (1.10 KB, patch)
2017-09-04 12:22 UTC, Iain Lane
none Details | Review
unarr: Fix build on s390x (1.59 KB, patch)
2017-09-04 14:18 UTC, Bastien Nocera
committed Details | Review

Description Iain Lane 2017-09-04 12:21:58 UTC
MY_CPU_BE expands to an empty token sequence, so defined (MY_CPU_BE) has
to be used in this context.  This code is only reachable for s390x,
ppc64 sets MY_CPU_NAME earlier.

This fixes a build failure on some arches (s390x).

Original patch by Florian Weimer in Fedora, forwarded upstream at
https://sourceforge.net/p/sevenzip/patches/317/
Comment 1 Iain Lane 2017-09-04 12:22:01 UTC
Created attachment 359071 [details] [review]
Fix preprocessor syntax for BE builds
Comment 2 Jeremy Bicha 2017-09-04 13:35:00 UTC
*** Bug 787086 has been marked as a duplicate of this bug. ***
Comment 3 Bastien Nocera 2017-09-04 14:18:33 UTC
Created attachment 359082 [details] [review]
unarr: Fix build on s390x

On some big-endian arches (where MY_CPU_NAME doesn't get set),
there is a preprocessor syntax error. It results in build failures
like this:

In file included from rar/../lzmasdk/Ppmd.h:8:0,
                 from rar/../lzmasdk/Ppmd7.h:12,
                 from rar/rar.h:10,
                 from rar/rar.c:4:
rar/../lzmasdk/CpuArch.h:177:18: error: #elif with no expression
   #elif MY_CPU_BE
                  ^
In file included from rar/../lzmasdk/Ppmd.h:8:0,
                 from rar/../lzmasdk/Ppmd7.h:12,
                 from rar/rar.h:10,
                 from rar/uncompress-rar.c:7:
rar/../lzmasdk/CpuArch.h:177:18: error: #elif with no expression
   #elif MY_CPU_BE
                  ^

With help from Iain Lane <iain@orangesquash.org.uk>

See https://sourceforge.net/p/sevenzip/patches/317/
Comment 4 Bastien Nocera 2017-09-04 14:23:49 UTC
Attachment 359082 [details] pushed as 0e70019 - unarr: Fix build on s390x