debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into utf8-conversion

Browse Source
This commit is contained in:
Jon Trulson
2019-09-16 13:24:18 -06:00
parent 8ba629fcd1 4f86508321
commit ddc3c8857b
126 changed files with 244 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/config/cf/DtInfo.tmpl
View File

@@ -412,7 +412,7 @@ TEMPLATE_OBJS=TemplateDB//**/*.o
#define TemplateObjs $(TEMPLATE_OBJS)
#if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture)
#if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture) || defined(AArch64Architecture)
# define ByteOrderDefines LittleEndianDefines
#elif defined(HAL32V7Architecture) || defined(SunArchitecture) || defined(AIXArchitecture) || defined(HPArchitecture)
# define ByteOrderDefines BigEndianDefines

11
cde/config/cf/Imake.cf
View File

@@ -79,7 +79,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
# undef amd64
# endif
# if defined(__arm__)
# define Arm32Architecture
# define ARMArchitecture
# undef __arm__
# if defined(zaurus)
# undef zaurus
@@ -474,14 +474,19 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
# define AMD64Architecture
# endif
# endif
# if defined(__arm__)
# undef __arm__
# if defined(__arm__) || defined(__arm32__)
# define ARMArchitecture
# undef __arm__
# undef __arm32__
# endif
# if defined(__sparc__) || defined(sparc)
# define SparcArchitecture
# undef sparc
# endif
# if defined(__aarch64__)
# define AArch64Architecture
# undef __aarch64__
# endif
#endif /* linux */
#if defined(sequent) || defined(_SEQUENT_)

10
cde/config/cf/linux.cf
View File

@@ -238,6 +238,16 @@ TIRPCINC =
# endif
#endif /* AMD64Architecture */
#ifdef AArch64Architecture
# ifndef OptimizedCDebugFlags
# define OptimizedCDebugFlags -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing
# endif
# define LinuxMachineDefines -D__aarch64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* AArch64Architecture */
#ifdef PpcArchitecture
# ifndef OptimizedCDebugFlags
# define OptimizedCDebugFlags DefaultGcc2i386Opt

2
cde/config/imake/imake.c
View File

@@ -824,7 +824,7 @@ get_distrib(FILE *inFile)
{
struct stat sb;
static char* yast = "/sbin/YaST";
static char* yast = "/sbin/yast";
static char* redhat = "/etc/redhat-release";
fprintf (inFile, "%s\n", "#define LinuxUnknown 0");