--- config/cf/BSDSUniX.cf.orig 2016-09-21 04:07:22.226818000 +0200 +++ config/cf/BSDSUniX.cf 2016-09-21 04:14:16.386868000 +0200 @@ -0,0 +1,323 @@ +XCOMM platform: $TOG: BSDSUniX.cf /main/18 1997/06/12 07:40:35 kaleb $ +XCOMM platform: $XFree86: xc/config/cf/BSDSUniX.cf,v 3.58.2.21 1999/12/02 14:27:24 hohndel Exp $ + +#ifndef UseElfFormat +#define UseElfFormat DefaultToElfFormat +#endif + +#if UseElfFormat +#define OSBinaryFormat [ELF] +#else +#define OSBinaryFormat /**/ +#endif + +#ifndef OSName +#define OSName DefaultOSName OSBinaryFormat +#endif +#ifndef OSVendor +#define OSVendor /**/ +#endif +#ifndef OSMajorVersion +#define OSMajorVersion DefaultOSMajorVersion +#endif +#ifndef OSMinorVersion +#define OSMinorVersion DefaultOSMinorVersion +#endif +#ifndef OSTeenyVersion +#define OSTeenyVersion DefaultOSTeenyVersion +#endif +XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + +#define HasGcc YES +#define HasGcc2 YES +#define HasCplusplus YES +#define HasGcc2ForCplusplus YES +#define GccUsesGas YES +#define UseGas YES +#define GnuCpp YES +#define HasNdbm YES +#define HasPutenv YES +#define HasSnprintf YES +#define HasBSD44Sockets YES +#ifndef HasLibCrypt +# define HasLibCrypt YES +#endif +#ifndef HasShm +# define HasShm YES +#endif +#define HasWChar32 YES + +#define AvoidNullMakeCommand YES +#define StripInstalledPrograms YES +#define CompressAllFonts YES +#define Malloc0ReturnsNull YES +#define NeedConstPrototypes YES +#define NeedFunctionPrototypes YES +#define NeedNestedPrototypes YES +#define NeedVarargsPrototypes YES +#define NeedWidePrototypes NO + +#define MkdirHierCmd mkdir -p + +#define CcCmd cc +#define CppCmd /usr/libexec/cpp +#define PreProcessCmd CppCmd +#define StandardCppDefines -traditional +#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) +#define DefaultCCOptions /**/ +#else +#define DefaultCCOptions -Dasm=__asm +#endif +#ifndef ExtraLibraries +/* support for multi-byte locales is in libxpg4 rather than libc */ +#define ExtraLibraries -lxpg4 +#endif +#ifndef UseGnuMalloc +#define UseGnuMalloc NO +#endif + +#define HasSetUserContext YES + +/* + * This doesn't work the way it does on every other system. On BSDSUniX it's + * only a "hint, not a demand", whatever that means. Note that this is not + * what it says in the ld and ld.so man pages, which are rather vague on the + * matter. + * + * But we do know that if a) you do what the X Project team does and set your + * ProjectRoot to something like "/X11", and b) you have other X libraries, + * e.g. in /usr/X11R6/lib, and you have added /usr/X11R6/lib to your + * ld.so.cache with ldconfig, then any programs linked with this "hint" will + * find that ld.so ignores the "hint" at runtime and loads the libraries in + * the ld.so.cache, i.e.the wrong ones, instead! Empirically we find that + * the run-path is only used as a last resort to find the libraries, after + * the LD_LIBRARY_PATH and ld.so.cache. + * + * N. B. to BSDSUniX users who are not familiar with the semantics of the run- + * path on other systems. The run-path is akin to a per-program ld.so.cache. + * If a program is linked with a run-path, that run-path should take + * precedence over _everything_ else! In my opinion ldconfig and the + * ld.so.cache should be deprecated immediately now that BSDSUniX has run- + * paths. Any program that needs libraries that are outside the "well known" + * locations should be linked with a run-path. + * + * All of which begs the question: If this option doesn't work in any useful + * way, why did they (BSDSUniX) bother to add it? It would be nice if BSDSUniX + * would fix ld.so so that run-paths are truly useful. + * + * Using run-paths is added with the intent that vendors who ship X for + * BSDSUniX should use it too. Once everyone uses it then there will be no + * reason for BSDSUniX to assume that it knows where X libraries are installed + * and they can remove it from the list of directories they add to ld.so.cache + * in their /etc/rc file. + */ +#ifndef ExtraLoadFlags +#if UseElfFormat +#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) +#else +#define ExtraLoadFlags -Wl,-R,$(USRLIBDIRPATH) +#endif +#endif + +#ifndef SharedLibraryLoadFlags +#if UseElfFormat +#define SharedLibraryLoadFlags -shared -rpath $(USRLIBDIRPATH) +#else +#define SharedLibraryLoadFlags -Bshareable -R $(USRLIBDIRPATH) +#endif +#endif + +#ifndef GnuMallocLibrary +#define GnuMallocLibrary -lgnumalloc +#endif + +#ifndef HasZlib +#define HasZlib YES +#endif + +#ifndef TkLibName +#define TkLibName tk80 +#endif +#ifndef TkIncDir +#define TkIncDir /usr/local/include/tk8.0 +#endif +#ifndef TclLibName +#define TclLibName tcl80 +#endif +#ifndef TclIncDir +#define TclIncDir /usr/local/include/tcl8.0 +#endif + +#ifndef JpTkLibName +#define JpTkLibName tk80jp +#endif +#ifndef JpTkIncDir +#define JpTkIncDir /usr/local/include/tk8.0jp +#endif +#ifndef JpTclLibName +#define JpTclLibName tcl80jp +#endif +#ifndef JpTclIncDir +#define JpTclIncDir /usr/local/include/tcl8.0jp +#endif + + +#undef InstallCmd +#define InstallCmd /usr/bin/install + +#if UseElfFormat +# define AsmElfDefines -D__ELF__ +#else +# define AsmElfDefines /**/ +#endif + +#if GccUsesGas +# define GccGasOption -DGCCUSESGAS +# define AsmDefines -DUSE_GAS AsmElfDefines +#else +# define GccGasOption /**/ +# define AsmDefines AsmElfDefines +#endif + +#define ServerExtraDefines GccGasOption XFree86ServerDefines + +#define StandardDefines -DCSRG_BASED + +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define XawI18nDefines -DUSE_XWCHAR_STRING +# define HasMakefileSafeInclude YES +# define IncludeMakefile(file) @@# dependencies are in .depend +# define DependFileName .depend +# ifndef BuildDynamicLoading +# define BuildDynamicLoading YES +# endif +# ifndef ForceNormalLib +# define ForceNormalLib YES +# endif +# define HasMkstemp YES + +#ifndef DefaultGcc2i386Opt +#define DefaultGcc2i386Opt -O2 +#endif + +#ifdef i386Architecture +# define OptimizedCDebugFlags DefaultGcc2i386Opt +#else +# define OptimizedCDebugFlags -O2 +#endif + +#ifndef PreIncDir +# define PreIncDir /usr/include +#endif + +#define TroffCmd groff -Tps +#define NroffCmd groff -Tascii +#define SetTtyGroup YES + +#ifndef ExtraFilesToClean +# define ExtraFilesToClean *.core +#endif + +#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/gnu/bin:/usr/local/bin +#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR) +#ifndef SystemManDirectory +#define SystemManDirectory /usr/share/man +#endif + +#define InstKmemFlags -g kmem -m 2755 + +/* + * Compress manual pages + */ +#ifndef CompressManPages +# define CompressManPages YES +#endif + +#if CompressManPages + +#ifndef CompressManCmd +# define CompressManCmd gzip -n +#endif + COMPRESSMANCMD = CompressManCmd + +#ifndef InstallManPageLong +#define InstallManPageLong(file,destdir,dest) @@\ +install.man:: file.man @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ + $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ + -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) +#endif + +#ifndef InstallGenManPageLong +#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ +install.man:: file.man @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.suffix* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ + $(DESTDIR)destdir/dest.suffix @@\ + -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix +#endif + +#ifndef InstallMultipleMan +#define InstallMultipleMan(list,dest) @@\ +install.man:: list @@\ + MakeDir($(DESTDIR)dest) @@\ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + for i in list; do \ @@\ + (set -x; \ @@\ + MNAME=`echo $$i | cut -f1 -d.`; \ @@\ + $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ + $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ + $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ + $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ + done +#endif + +/* + * InstallManPageAliases - install soft links for aliases. + */ +#ifndef InstallManPageAliases +#define InstallManPageAliases(file,destdir,aliases) @@\ +install.man:: @@\ + @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\ + for i in aliases; do (set -x; \ @@\ + $(RM) $(DESTDIR)destdir/$$i.*; \ @@\ + (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\ + $$i.$${SUFFIX})); \ @@\ + done) +#endif + +/* + * InstallGenManPageAliases - install soft links for aliases. + */ +#ifndef InstallGenManPageAliases +#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ + InstallManPageAliases(file,destdir,aliases) +#endif +#endif + +#define HasBsdMake YES + +#ifndef StaticLibrary +#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic +#endif + +#if UseElfFormat +#define DlLibrary -rdynamic +#else +#define DlLibrary /**/ +#endif + +#if BuildDynamicLoading +#define ServerExtraSysLibs DlLibrary +#else +#define ServerExtraSysLibs /**/ +#endif + +#include + +#ifdef i386Architecture +#include +#endif