diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-02-07 19:46:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-02-07 19:46:12 +0000 |
| commit | ead8e7a15fd07933fef0a373564e74d698988cc4 (patch) | |
| tree | 0016d5298c8fc785de57795803c378b2fe8352ee | |
| parent | eb2ee4ddbc560aaa5b74172c2c72851785efb40a (diff) | |
Disable build of Xserver on hp300 and mac68k. Building the Xserver
with gcc 2.95 is getting hopeless and there is not enough manpower at
the moment to switch these platforms to a more recent compiler.
ok miod@, Nick@
| -rw-r--r-- | driver/Makefile | 12 | ||||
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/driver/Makefile b/driver/Makefile index 7552bd664..b9d8049dd 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2012/02/06 22:53:02 matthieu Exp $ +# $OpenBSD: Makefile,v 1.42 2012/02/07 19:46:11 matthieu Exp $ # The input driver ABI broke between xserver 1.9 and 1.10. # Some drivers were updated to the new ABI without keeping compatibility @@ -23,6 +23,8 @@ INPUT_DRV_alpha= INPUT_DRV_amd64= ${INPUT_DRV_COMMON} xf86-input-synaptics xf86-input-vmmouse +INPUT_DRV_hp300= + INPUT_DRV_hppa= ${INPUT_DRV_DEFAULT} INPUT_DRV_i386= ${INPUT_DRV_COMMON} xf86-input-synaptics xf86-input-vmmouse @@ -31,10 +33,13 @@ INPUT_DRV_landisk= INPUT_DRV_loongson= ${INPUT_DRV_DEFAULT} +INPUT_DRV_mac68k= + INPUT_DRV_macppc= ${INPUT_DRV_COMMON} INPUT_DRV_mvme68k= INPUT_DRV_mvme88k= + INPUT_DRV_sgi= ${INPUT_DRV_DEFAULT} INPUT_DRV_sparc64= ${INPUT_DRV_COMMON} @@ -72,6 +77,8 @@ VIDEO_DRV_amd64= \ VIDEO_DRV_armish= \ xf86-video-wsfb xf86-video-wsudl +VIDEO_DRV_hp300= + VIDEO_DRV_hppa= \ xf86-video-wsfb \ xf86-video-wsudl @@ -93,12 +100,15 @@ VIDEO_DRV_landisk= VIDEO_DRV_loonson= \ xf86-video-siliconmotion xf86-video-wsfb +VIDEO_DRV_mac68k= + VIDEO_DRV_macppc= \ xf86-video-ati xf86-video-mach64 xf86-video-nv xf86-video-r128 \ xf86-video-wsfb xf86-video-wsudl VIDEO_DRV_mvme68k= VIDEO_DRV_mvme88k= + VIDEO_DRV_sgi= xf86-video-wsfb VIDEO_DRV_sparc64= \ diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index 512261480..60c221288 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.40 2011/11/05 13:32:40 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.41 2012/02/07 19:46:11 matthieu Exp $ .include <bsd.xconf.mk> DIST= ${.CURDIR} # Machines for which we don't build the Xorg Xserver -NO_XORG_MACHINES= alpha aviion hppa64 landisk \ +NO_XORG_MACHINES= alpha aviion hp300 hppa64 landisk mac68k \ mvme68k mvme88k mvmeppc solbourne vax NO_XF86UTIL_MACHINES= hp300 landisk mac68k sgi sparc vax |