← Back to branch summary

~ubuntu-desktop/evince/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/evince-lzmasdk-s390x.patch

  • Committer: Iain Lane
  • Date: 2017-09-04 11:43:41 UTC
  • Revision ID: iain.lane@canonical.com-20170904114341-zjmi88nmjw4s296a
Fix preprocessor syntax in unarr/lzmasdk/CpuArch.h to resolve build
failure on s390x.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/evince-lzmasdk-s390x.patch
 
1
Description: 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.
 
2
Author: Florian Weimer <fweimer@redhat.com> 
 
3
Origin: vendor, https://src.fedoraproject.org/rpms/evince/raw/91d446dec9f452adade222bdf6a2c26b5b9caee4/f/evince-lzmasdk-s390x.patch
 
4
 
 
5
diff -ur evince-3.25.4.orig/cut-n-paste/unarr/lzmasdk/CpuArch.h evince-3.25.4/cut-n-paste/unarr/lzmasdk/CpuArch.h
 
6
--- evince-3.25.4.orig/cut-n-paste/unarr/lzmasdk/CpuArch.h      2017-07-22 07:58:23.000000000 +0200
 
7
+++ evince-3.25.4/cut-n-paste/unarr/lzmasdk/CpuArch.h   2017-07-31 13:32:33.893245858 +0200
 
8
@@ -174,7 +174,7 @@
 
9
 #ifndef MY_CPU_NAME
 
10
   #ifdef MY_CPU_LE
 
11
     #define MY_CPU_NAME "LE"
 
12
-  #elif MY_CPU_BE
 
13
+  #elif defined (MY_CPU_BE)
 
14
     #define MY_CPU_NAME "BE"
 
15
   #else
 
16
     /*
 
17
Only in evince-3.25.4/cut-n-paste/unarr/lzmasdk: CpuArch.h~