XQuartz: Fat binary buildfixes
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
(cherry picked from commit f54736c2b0
)
This commit is contained in:
parent
fbf44d85bd
commit
4f00423187
13
configure.ac
13
configure.ac
|
@ -1186,19 +1186,6 @@ AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])
|
|||
AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
|
||||
|
||||
XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
|
||||
AC_DEFINE_UNQUOTED(_X_BYTE_ORDER,[$ENDIAN],[Endian order])
|
||||
AH_VERBATIM([X_BYTE_ORDER],[
|
||||
/* Deal with multiple architecture compiles on Mac OS X */
|
||||
#ifndef __APPLE_CC__
|
||||
#define X_BYTE_ORDER _X_BYTE_ORDER
|
||||
#else
|
||||
#ifdef __BIG_ENDIAN__
|
||||
#define X_BYTE_ORDER X_BIG_ENDIAN
|
||||
#else
|
||||
#define X_BYTE_ORDER X_LITTLE_ENDIAN
|
||||
#endif
|
||||
#endif
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl DDX section.
|
||||
|
|
10
include/dix-config-post-verbatim.h
Normal file
10
include/dix-config-post-verbatim.h
Normal file
|
@ -0,0 +1,10 @@
|
|||
/* Do not include this file directly. It is included at the end of <dix-config.h> */
|
||||
|
||||
/* Correctly set _XSERVER64 for OSX fat binaries */
|
||||
#ifdef __APPLE__
|
||||
#if defined(__LP64__) && !defined(_XSERVER64)
|
||||
#define _XSERVER64 1
|
||||
#elif !defined(__LP64__) && defined(_XSERVER64)
|
||||
#undef _XSERVER64
|
||||
#endif
|
||||
#endif
|
|
@ -363,19 +363,6 @@
|
|||
/* Vendor name */
|
||||
#undef XVENDORNAME
|
||||
|
||||
/* Endian order */
|
||||
#undef _X_BYTE_ORDER
|
||||
/* Deal with multiple architecture compiles on Mac OS X */
|
||||
#ifndef __APPLE_CC__
|
||||
#define X_BYTE_ORDER _X_BYTE_ORDER
|
||||
#else
|
||||
#ifdef __BIG_ENDIAN__
|
||||
#define X_BYTE_ORDER X_BIG_ENDIAN
|
||||
#else
|
||||
#define X_BYTE_ORDER X_LITTLE_ENDIAN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Enable GNU and other extensions to the C environment for GLIBC */
|
||||
#undef _GNU_SOURCE
|
||||
|
||||
|
@ -442,4 +429,6 @@
|
|||
/* Define to 1 if you have the `ffs' function. */
|
||||
#undef HAVE_FFS
|
||||
|
||||
#include <dix-config-post-verbatim.h>
|
||||
|
||||
#endif /* _DIX_CONFIG_H_ */
|
||||
|
|
|
@ -145,19 +145,6 @@
|
|||
/* Vendor name */
|
||||
#undef XVENDORNAME
|
||||
|
||||
/* Endian order */
|
||||
#undef _X_BYTE_ORDER
|
||||
/* Deal with multiple architecture compiles on Mac OS X */
|
||||
#ifndef __APPLE_CC__
|
||||
#define X_BYTE_ORDER _X_BYTE_ORDER
|
||||
#else
|
||||
#ifdef __BIG_ENDIAN__
|
||||
#define X_BYTE_ORDER X_BIG_ENDIAN
|
||||
#else
|
||||
#define X_BYTE_ORDER X_LITTLE_ENDIAN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* BSD-compliant source */
|
||||
#undef _BSD_SOURCE
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user