Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.895 diff -u -2 -0 -r1.895 ChangeLog --- xc/ChangeLog 23 Apr 2005 19:36:48 -0000 1.895 +++ xc/ChangeLog 23 Apr 2005 20:16:15 -0000 @@ -1,20 +1,34 @@ +2005-04-23 Roland Mainz + * xc/config/cf/linux.cf + * xc/config/cf/sun.cf + bugzilla #3023 (https://bugs.freedesktop.org/show_bug.cgi?id=3023) + attachment #2417 (https://bugs.freedesktop.org/attachment.cgi?id=2417) + Make the Xserver and libraries (X11, Xt, Xaw etc.) and client + applications largefile-aware by default on Linux and Solaris (*BSD + platforms and IRIX are aready largefile-aware by default, only the + status of AIX+HP/UX is currently unknown). The change does not + affect Xserver modules loaded via the ELF loader which would either + require an ABI change or a port of the whole lf64(5) API (both steps + may not be required as the ELF loader may go away in favour of the DL + loader where the libc wrapper is no longer needed to access files). + 2005-04-23 Adam Jackson * config/cf/X11.tmpl: Bug #2606: Force the Security extension to be built if the Appgroup extension is requested. 2005-04-23 Adam Jackson * programs/Xserver/hw/xfree86/loader/loadmod.c: Bug #3016: Don't complain as loudly about failing to load a module that's already loaded. 2005-04-23 Adam Jackson * programs/Xserver/hw/xfree86/loader/elf.h: * programs/Xserver/hw/xfree86/loader/elfloader.c: Bug #3109: Handle R_ALPHA_BRSGP relocations in elfloader. (Sergey Tikhonov) 2005-04-22 Alan Coopersmith Index: xc/config/cf/linux.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/linux.cf,v retrieving revision 1.25 diff -u -2 -0 -r1.25 linux.cf --- xc/config/cf/linux.cf 11 Apr 2005 10:41:40 -0000 1.25 +++ xc/config/cf/linux.cf 23 Apr 2005 20:16:16 -0000 @@ -213,40 +213,41 @@ #else # define LinuxLocaleDefines -DX_LOCALE #endif #ifndef LinuxAdditionalIncludes # define LinuxAdditionalIncludes /**/ #endif #ifndef LinuxGnuSourceDefines # ifdef UseInstalled # define LinuxGnuSourceDefines /**/ # else # define LinuxGnuSourceDefines -D_GNU_SOURCE # endif #endif #if LinuxCLibMajorVersion >= 6 # define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ -D_POSIX_SOURCE -D_XOPEN_SOURCE \ -D_BSD_SOURCE -D_SVID_SOURCE \ + -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ LinuxAdditionalIncludes LinuxGnuSourceDefines \ LinuxLocaleDefines # define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H # define HasPosixThreads YES # define ThreadedX YES # define HasThreadSafeAPI YES # define ThreadsLibraries -lpthread # define SystemMTDefines -D_REENTRANT # ifndef HasLibCrypt # define HasLibCrypt YES # endif /* netscape wraps select but not poll as of communicator 4.72 */ # ifndef HasPoll # define HasPoll NO # endif #else # define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ -D_BSD_SOURCE -D_SVID_SOURCE \ LinuxGnuSourceDefines LinuxLocaleDefines # define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC Index: xc/config/cf/sun.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/sun.cf,v retrieving revision 1.10 diff -u -2 -0 -r1.10 sun.cf --- xc/config/cf/sun.cf 8 Nov 2004 00:08:21 -0000 1.10 +++ xc/config/cf/sun.cf 23 Apr 2005 20:16:18 -0000 @@ -299,50 +299,58 @@ # define CplusplusDependIncludes -I/opt/SUNWspro/SC2.0.1/include/CC # endif # endif # endif /* HasSunC */ # if HasSunC && (CCompilerMajorVersion < 3) # define BootstrapCFlags -DSVR4 # else # define BootstrapCFlags /* none needed */ # endif # ifndef XawI18nDefines # if OSMinorVersion < 4 # define XawI18nDefines -DHAS_WCTYPE_H -DHAS_ISW_FUNCS # else # define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS # endif # endif # if OSMinorVersion > 3 # define InstallCmd /usr/ucb/install # endif +#ifndef LargefileDefines +# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6) +# define LargefileDefines -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +# else +# define LargefileDefines /* */ +# endif +#endif # ifdef i386Architecture # if (OSMajorVersion < 4) || ((OSMajorVersion == 5) && (OSMinorVersion <= 5)) # define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \ - -D__SOL64__ + -D__SOL64__ LargefileDefines # else -# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 +# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \ + LargefileDefines # endif # define ToolkitStringsABIOptions -intelabi # else -# define StandardDefines -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ +# define StandardDefines -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ LargefileDefines # define ToolkitStringsABIOptions -sparcabi # endif # define ExtraLibraries -lsocket -lnsl # if OSMinorVersion > 1 # ifndef ThreadedX # define ThreadedX YES # endif # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API # if HasSunC && CCompilerMajorVersion > 2 # define ThreadsCompileFlags -mt # else # define SystemMTDefines -D_REENTRANT # define ThreadsLibraries -lthread # endif # if HasSunCplusplus && CplusplusCompilerMajorVersion > 3 # define ThreadsCplusplusCompileFlags -mt # else # define CplusplusSystemMTDefines -D_REENTRANT # define ThreadsCplusplusLibraries -lthread # endif