projects / packages / xorg-cf-files.git / blame
| Commit | Line | Data |
|---|---|---|
| 92aae754 JB |
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 | |
| 4 | # undef __amd64__ | |
| 5 | # undef __x86_64__ | |
| 6 | # define AMD64Architecture | |
| 566f080d | 7 | +# if defined(_ILP32) || defined(__ILP32__) |
| 92aae754 JB |
8 | +# define AMD64ArchX32ABI |
| 9 | +# endif | |
| 10 | # endif | |
| 11 | # if defined(amd64__) || defined (x86_64__) | |
| 12 | # undef amd64__ | |
| 566f080d JB |
13 | --- xorg-cf-files-1.0.8/linux.cf.orig 2023-03-01 18:20:50.043361935 +0100 |
| 14 | +++ xorg-cf-files-1.0.8/linux.cf 2023-03-01 18:21:50.653033584 +0100 | |
| 15 | @@ -589,13 +589,21 @@ InstallNamedTargetNoClobber(install,file | |
| 92aae754 JB |
16 | #define MkdirHierCmd mkdir -p |
| 17 | ||
| 18 | #ifndef HaveLib64 | |
| 566f080d JB |
19 | -# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined (RV64Architecture) |
| 20 | +# if defined ((AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined (RV64Architecture)) && !defined(AMD64ArchX32ABI) | |
| 92aae754 JB |
21 | # define HaveLib64 YES |
| 22 | # else | |
| 23 | # define HaveLib64 NO | |
| 24 | # endif | |
| 25 | #endif | |
| 26 | ||
| 27 | +#ifndef HaveLibX32 | |
| 28 | +# if defined (AMD64ArchX32ABI) | |
| 29 | +# define HaveLibX32 YES | |
| 30 | +# else | |
| 31 | +# define HaveLibX32 NO | |
| 32 | +# endif | |
| 33 | +#endif | |
| 34 | + | |
| 35 | #if UseElfFormat | |
| 36 | # ifndef DoLoadableServer | |
| 37 | # if defined(MipsArchitecture) || defined(SuperHArchitecture) | |
| 566f080d | 38 | @@ -655,16 +663,20 @@ InstallNamedTargetNoClobber(install,file |
| 92aae754 JB |
39 | # ifndef TermcapLibrary |
| 40 | # if UseStaticTermcapLib | |
| 41 | # if LinuxUsesNcurses | |
| 42 | -# if !HaveLib64 | |
| 43 | -# define TermcapLibrary StaticLibrary(/usr/lib,ncurses) | |
| 44 | -# else | |
| 45 | +# if HaveLib64 | |
| 46 | # define TermcapLibrary StaticLibrary(/usr/lib64,ncurses) | |
| 47 | +# elif HaveLibX32 | |
| 48 | +# define TermcapLibrary StaticLibrary(/usr/libx32,ncurses) | |
| 49 | +# else | |
| 50 | +# define TermcapLibrary StaticLibrary(/usr/lib,ncurses) | |
| 51 | # endif | |
| 52 | # else | |
| 53 | -# if !HaveLib64 | |
| 54 | -# define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap) | |
| 55 | -# else | |
| 56 | +# if HaveLib64 | |
| 57 | # define TermcapLibrary StaticLibrary(/usr/lib64/termcap,termcap) | |
| 58 | +# elif HaveLibX32 | |
| 59 | +# define TermcapLibrary StaticLibrary(/usr/libx32/termcap,termcap) | |
| 60 | +# else | |
| 61 | +# define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap) | |
| 62 | # endif | |
| 63 | # endif | |
| 64 | # else | |
| 566f080d | 65 | @@ -1127,6 +1139,16 @@ InstallNamedTargetNoClobber(install,file |
| 92aae754 JB |
66 | # ifndef TkLibDir |
| 67 | # define TkLibDir /usr/lib64 | |
| 68 | # endif | |
| 69 | +#elif HaveLibX32 | |
| 70 | +# ifndef LibDirName | |
| 71 | +# define LibDirName libx32 | |
| 72 | +# endif | |
| 73 | +# ifndef SystemUsrLibDir | |
| 74 | +# define SystemUsrLibDir /usr/libx32 | |
| 75 | +# endif | |
| 76 | +# ifndef TkLibDir | |
| 77 | +# define TkLibDir /usr/libx32 | |
| 78 | +# endif | |
| 79 | #endif | |
| 80 | ||
| 81 | #ifndef BuildDmx | |
| 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 | |
| 85 | #endif | |
| 86 | #ifndef LibDir | |
| 87 | # ifdef ProjectRoot | |
| 88 | -# define LibDir Concat(ProjectRoot,/lib/X11) | |
| 89 | +# define LibDir Concat(ProjectRoot,/LibDirName/X11) | |
| 90 | # else | |
| 91 | -# define LibDir /usr/lib/X11 | |
| 92 | +# define LibDir /usr/LibDirName/X11 | |
| 93 | # endif | |
| 94 | #endif | |
| 95 | #ifndef ModuleDir |