diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2009-02-13 20:33:38 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2009-02-13 20:33:38 +0000 |
| commit | d566a69282c82980e1a8e59fced838bfb185ea71 (patch) | |
| tree | 6604510dbd6b266cd6b624932308a1fc6fb8a3ea | |
| parent | 9a1511291a085d72456ababd865e8cd0f33c8ea4 (diff) | |
fix imake scaffolding for mips (sgi); originally from Brad
ok matthieu@ (has been in snaps for ages..)
| -rw-r--r-- | util/cf/OpenBSD.cf | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/util/cf/OpenBSD.cf b/util/cf/OpenBSD.cf index e7fbc659a..51f365f71 100644 --- a/util/cf/OpenBSD.cf +++ b/util/cf/OpenBSD.cf @@ -436,8 +436,6 @@ install:: fonts.alias @@\ #ifdef AMD64Architecture # define HasWeakSymbols YES -# define HasSharedLibraries YES -# define HasDlopen YES # define XorgServer YES @@ -666,51 +664,26 @@ install:: fonts.alias @@\ /* - * Definitions for the mips architecture (currently arc, pmax) + * Definitions for the mips architecture (currently sgi) */ #ifdef MipsArchitecture - /* - * Mips ELF shared libs need some special handling. - */ -# define PositionIndependentCFlags -# define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ | sed 's/\.[0-9]*$$//'` -# define SharedXtReqs -L$(BUILDLIBDIR) $(XONLYLIB) $(SMLIB) $(ICELIB) -# define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XLIB) - -#endif /* MipsArchitecture */ - +# define HasWeakSymbols YES -/* - * Definitions for the arc architecture - */ -#ifdef ArcArchitecture +# define XorgServer YES -# define ServerExtraDefines GccGasOption XFree86ServerDefines -# ifndef XFree86ConsoleDefines -# define XFree86ConsoleDefines -DPCCONS_SUPPORT +# if XorgServer +# ifndef DoLoadableServer +# define DoLoadableServer YES # endif +# define XF86CardDrivers wsfb +# define XFree86ConsoleDefines -DWSCONS_SUPPORT +# endif # include <xorg.cf> -#endif /* ArcArchitecture */ - - -/* - * Definitions for the pmax architecture - */ -#ifdef PmaxArchitecture - -# include <xf86.rules> -# ifndef BuildServer -# define BuildServer NO -# endif -/* For the X11R5 server */ -# define CompressAllFonts NO -# define InstallFontAliases InstallFontAliasesNoComment -# define UseRgbTxt NO +#endif /* MipsArchitecture */ -#endif /* PmaxArchitecture */ /* * Definitions for the PowerPC architecture |