1 --- xorg-cf-files-1.0.6/Imake.cf.orig 2015-12-22 02:28:02.000000000 +0100
2 +++ xorg-cf-files-1.0.6/Imake.cf 2016-04-13 18:09:27.418272365 +0200
3 @@ -1025,6 +1025,9 @@ XCOMM Keep cpp from replacing path eleme
6 # define AMD64Architecture
7 +# if defined(_ILP32) | defined(__ILP32__)
8 +# define AMD64ArchX32ABI
11 # if defined(amd64__) || defined (x86_64__)
13 --- xorg-cf-files-1.0.6/linux.cf.orig 2016-04-13 18:03:18.456082965 +0200
14 +++ xorg-cf-files-1.0.6/linux.cf 2016-04-13 18:13:41.561260974 +0200
15 @@ -579,13 +579,21 @@ InstallNamedTargetNoClobber(install,file
16 #define MkdirHierCmd mkdir -p
19 -# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
20 +# if (defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)) && !defined (AMD64ArchX32ABI)
21 # define HaveLib64 YES
28 +# if defined (AMD64ArchX32ABI)
29 +# define HaveLibX32 YES
31 +# define HaveLibX32 NO
36 # ifndef DoLoadableServer
37 # if defined(MipsArchitecture) || defined(SuperHArchitecture)
38 @@ -645,16 +653,20 @@ InstallNamedTargetNoClobber(install,file
39 # ifndef TermcapLibrary
40 # if UseStaticTermcapLib
43 -# define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
46 # define TermcapLibrary StaticLibrary(/usr/lib64,ncurses)
48 +# define TermcapLibrary StaticLibrary(/usr/libx32,ncurses)
50 +# define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
54 -# define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap)
57 # define TermcapLibrary StaticLibrary(/usr/lib64/termcap,termcap)
59 +# define TermcapLibrary StaticLibrary(/usr/libx32/termcap,termcap)
61 +# define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap)
65 @@ -1081,6 +1093,16 @@ InstallNamedTargetNoClobber(install,file
67 # define TkLibDir /usr/lib64
71 +# define LibDirName libx32
73 +# ifndef SystemUsrLibDir
74 +# define SystemUsrLibDir /usr/libx32
77 +# define TkLibDir /usr/libx32
82 --- xorg-cf-files-1.0.6/X11.tmpl.orig 2015-12-22 02:28:02.000000000 +0100
83 +++ xorg-cf-files-1.0.6/X11.tmpl 2016-04-13 18:06:00.297687169 +0200
84 @@ -1461,9 +1461,9 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
88 -# define LibDir Concat(ProjectRoot,/lib/X11)
89 +# define LibDir Concat(ProjectRoot,/LibDirName/X11)
91 -# define LibDir /usr/lib/X11
92 +# define LibDir /usr/LibDirName/X11