mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-09 10:48:48 +00:00
Remove support vax and XENOCARA_HAVE_SHARED_LIBS scaffolding.
ok matthieu@
This commit is contained in:
okan
7
Makefile
7
Makefile
@@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.68 2015/08/24 10:41:21 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.69 2016/03/11 13:09:42 okan Exp $
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.xconf.mk>
|
||||
|
||||
@@ -8,14 +8,11 @@ REALAPPD=/etc/X11/app-defaults
|
||||
XCONFIG=${XSRCDIR}/etc/X11.${MACHINE}/xorg.conf
|
||||
RM?=rm
|
||||
|
||||
.if ${MACHINE_ARCH} != "vax"
|
||||
XSERVER= xserver
|
||||
.endif
|
||||
|
||||
.if defined(XENOCARA_BUILD_PIXMAN)
|
||||
.if ${XENOCARA_BUILD_PIXMAN:L} == "yes" && \
|
||||
${XENOCARA_BUILD_GL:L} == "yes" && \
|
||||
${XENOCARA_HAVE_SHARED_LIBS:L} == "yes"
|
||||
${XENOCARA_BUILD_GL:L} == "yes"
|
||||
XSERVER+= kdrive
|
||||
.endif
|
||||
.endif
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
Post-installation instructions for X.Org on OpenBSD/vax
|
||||
-------------------------------------------------------
|
||||
|
||||
There is no X server for vax. Only userland X.
|
||||
|
||||
problem_blurb
|
||||
|
||||
$OpenBSD: README.vax,v 1.2 2010/08/05 06:34:19 matthieu Exp $
|
||||
@@ -1,69 +0,0 @@
|
||||
./usr/X11R6/bin/ucs2any
|
||||
./usr/X11R6/include/libdrm
|
||||
./usr/X11R6/include/xorg
|
||||
./usr/X11R6/man/man1/bdftruncate.1
|
||||
./usr/X11R6/man/man1/dga.1
|
||||
./usr/X11R6/man/man1/ucs2any.1
|
||||
./usr/X11R6/man/man3/XDGA.3
|
||||
./usr/X11R6/man/man3/XDGAChangePixmapMode.3
|
||||
./usr/X11R6/man/man3/XDGACloseFramebuffer.3
|
||||
./usr/X11R6/man/man3/XDGACopyArea.3
|
||||
./usr/X11R6/man/man3/XDGACopyTransparentArea.3
|
||||
./usr/X11R6/man/man3/XDGACreateColormap.3
|
||||
./usr/X11R6/man/man3/XDGAFillRectangle.3
|
||||
./usr/X11R6/man/man3/XDGAGetViewportStatus.3
|
||||
./usr/X11R6/man/man3/XDGAInstallColormap.3
|
||||
./usr/X11R6/man/man3/XDGAKeyEventToXKeyEvent.3
|
||||
./usr/X11R6/man/man3/XDGAOpenFramebuffer.3
|
||||
./usr/X11R6/man/man3/XDGAQueryExtension.3
|
||||
./usr/X11R6/man/man3/XDGAQueryModes.3
|
||||
./usr/X11R6/man/man3/XDGAQueryVersion.3
|
||||
./usr/X11R6/man/man3/XDGASelectInput.3
|
||||
./usr/X11R6/man/man3/XDGASetClientVersion.3
|
||||
./usr/X11R6/man/man3/XDGASetMode.3
|
||||
./usr/X11R6/man/man3/XDGASetViewport.3
|
||||
./usr/X11R6/man/man3/XDGASync.3
|
||||
./usr/X11R6/man/man3/XF86DGA.3
|
||||
./usr/X11R6/man/man3/XF86Misc.3
|
||||
./usr/X11R6/man/man3/XF86MiscGetKbdSettings.3
|
||||
./usr/X11R6/man/man3/XF86MiscGetMouseSettings.3
|
||||
./usr/X11R6/man/man3/XF86MiscGetSaver.3
|
||||
./usr/X11R6/man/man3/XF86MiscQueryExtension.3
|
||||
./usr/X11R6/man/man3/XF86MiscQueryVersion.3
|
||||
./usr/X11R6/man/man3/XF86MiscSetKbdSettings.3
|
||||
./usr/X11R6/man/man3/XF86MiscSetMouseSettings.3
|
||||
./usr/X11R6/man/man3/XF86MiscSetSaver.3
|
||||
./usr/X11R6/man/man3/XF86VM.3
|
||||
./usr/X11R6/man/man3/XF86VidModeDeleteModeLine.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetAllModeLines.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetDotClocks.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetGamma.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetGammaRamp.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetGammaRampSize.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetModeLine.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetMonitor.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetPermissions.3
|
||||
./usr/X11R6/man/man3/XF86VidModeGetViewPort.3
|
||||
./usr/X11R6/man/man3/XF86VidModeLockModeSwitch.3
|
||||
./usr/X11R6/man/man3/XF86VidModeModModeLine.3
|
||||
./usr/X11R6/man/man3/XF86VidModeQueryExtension.3
|
||||
./usr/X11R6/man/man3/XF86VidModeQueryVersion.3
|
||||
./usr/X11R6/man/man3/XF86VidModeSetClientVersion.3
|
||||
./usr/X11R6/man/man3/XF86VidModeSetGamma.3
|
||||
./usr/X11R6/man/man3/XF86VidModeSetGammaRamp.3
|
||||
./usr/X11R6/man/man3/XF86VidModeSetViewPort.3
|
||||
./usr/X11R6/man/man3/XF86VidModeSwitchMode.3
|
||||
./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
|
||||
./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
|
||||
./usr/X11R6/man/man3/XFree86-DGA.3
|
||||
./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-4
|
||||
./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-4
|
||||
./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-4
|
||||
./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-4
|
||||
./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-4
|
||||
./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-4
|
||||
./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-4
|
||||
./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-4
|
||||
./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-4
|
||||
./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-4
|
||||
./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-4
|
||||
@@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.65 2016/02/20 11:07:10 matthieu Exp $
|
||||
# $OpenBSD: Makefile,v 1.66 2016/03/11 13:09:42 okan Exp $
|
||||
|
||||
INPUT_DRV_DEFAULT= \
|
||||
xf86-input-keyboard \
|
||||
@@ -34,8 +34,6 @@ INPUT_DRV_sgi= ${INPUT_DRV_DEFAULT}
|
||||
|
||||
INPUT_DRV_sparc64= ${INPUT_DRV_COMMON}
|
||||
|
||||
INPUT_DRV_vax=
|
||||
|
||||
INPUT_DRV_zaurus= ${INPUT_DRV_DEFAULT}
|
||||
|
||||
.if defined(INPUT_DRV_${MACHINE})
|
||||
@@ -95,8 +93,6 @@ VIDEO_DRV_sparc64= \
|
||||
xf86-video-sunffb \
|
||||
xf86-video-wildcatfb xf86-video-wsfb
|
||||
|
||||
VIDEO_DRV_vax=
|
||||
|
||||
.if defined(VIDEO_DRV_${MACHINE})
|
||||
VIDEO_DRV= ${VIDEO_DRV_${MACHINE}}
|
||||
.else
|
||||
|
||||
@@ -26,11 +26,7 @@
|
||||
(struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
|
||||
instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
|
||||
MSVC and with C++ compilers. */
|
||||
#if defined(__GNUC__) && __GNUC__ == 2 /* __vax__ */
|
||||
#define FLEXIBLE_ARRAY_MEMBER 1
|
||||
#else
|
||||
#define FLEXIBLE_ARRAY_MEMBER /**/
|
||||
#endif
|
||||
|
||||
/* Define to 1 if you have the `arc4random' function. */
|
||||
#define HAVE_ARC4RANDOM 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2014/05/18 10:33:05 matthieu Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2016/03/11 13:09:42 okan Exp $
|
||||
|
||||
.include <bsd.xconf.mk>
|
||||
|
||||
@@ -68,17 +68,10 @@ fcobjshash.h: fcobjshash.gperf
|
||||
|
||||
beforedepend: fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la
|
||||
|
||||
.if ${XENOCARA_HAVE_SHARED_LIBS:L} == "yes"
|
||||
lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
|
||||
sed -e 's#@libdir@#${LIBDIR}#g' \
|
||||
-e 's#@sharedlibfontconfig@#libfontconfig.so.${SHLIB_MAJOR}.${SHLIB_MINOR}#g' \
|
||||
< $? > $@
|
||||
.else
|
||||
lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
|
||||
sed -e 's#@libdir@#${LIBDIR}#g' \
|
||||
-e 's#@sharedlibfontconfig@##g' \
|
||||
< $? > $@
|
||||
.endif
|
||||
|
||||
afterinstall:
|
||||
${INSTALL_DATA} lib${LIB}.la ${DESTDIR}${LIBDIR}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.23 2015/04/06 20:57:55 matthieu Exp $
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.24 2016/03/11 13:09:42 okan Exp $
|
||||
.include <bsd.xconf.mk>
|
||||
|
||||
SHARED_LIBS= X11 16.1 X11_xcb 2.0
|
||||
@@ -7,8 +7,4 @@ CONFIGURE_ARGS= --enable-tcp-transport --enable-unix-transport --enable-ipv6 \
|
||||
--disable-composecache \
|
||||
--without-xmlto --without-fop --without-xsltproc
|
||||
|
||||
.if ${XENOCARA_HAVE_SHARED_LIBS:L} == "no"
|
||||
CONFIGURE_ARGS+= --disable-loadable-xcursor
|
||||
.endif
|
||||
|
||||
.include <bsd.xorg.mk>
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.13 2014/09/27 17:42:14 matthieu Exp $
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.14 2016/03/11 13:09:42 okan Exp $
|
||||
.include <bsd.xconf.mk>
|
||||
|
||||
SHARED_LIBS= Xfont 12.0
|
||||
|
||||
CONFIGURE_ARGS+= --with-xmlto=no
|
||||
|
||||
.if ${XENOCARA_HAVE_SHARED_LIBS:L} == "no"
|
||||
CONFIGURE_ARGS+= --disable-loadable-font-modules
|
||||
.endif
|
||||
|
||||
.include <bsd.xorg.mk>
|
||||
|
||||
@@ -1,24 +1,13 @@
|
||||
# $OpenBSD: bsd.xconf.mk,v 1.32 2016/02/20 10:51:26 matthieu Exp $
|
||||
|
||||
# Shared libs?
|
||||
.if ${MACHINE} == "vax"
|
||||
XENOCARA_HAVE_SHARED_LIBS?=no
|
||||
.else
|
||||
XENOCARA_HAVE_SHARED_LIBS?=yes
|
||||
.endif
|
||||
# $OpenBSD: bsd.xconf.mk,v 1.33 2016/03/11 13:09:42 okan Exp $
|
||||
|
||||
# Build GL libs and apps?
|
||||
.if ${MACHINE_ARCH} == "m88k"
|
||||
XENOCARA_BUILD_GL?=no
|
||||
XENOCARA_BUILD_DRI?=no
|
||||
.else
|
||||
XENOCARA_BUILD_GL?=${XENOCARA_HAVE_SHARED_LIBS:L}
|
||||
XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L}
|
||||
XENOCARA_BUILD_GL?=yes
|
||||
XENOCARA_BUILD_DRI?=yes
|
||||
.endif
|
||||
|
||||
# Build pixman?
|
||||
.if ${MACHINE} == "vax"
|
||||
XENOCARA_BUILD_PIXMAN?=no
|
||||
.else
|
||||
XENOCARA_BUILD_PIXMAN?=yes
|
||||
.endif
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.60 2016/02/20 10:58:10 matthieu Exp $
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.61 2016/03/11 13:09:42 okan Exp $
|
||||
|
||||
.include <bsd.xconf.mk>
|
||||
|
||||
DIST= ${.CURDIR}
|
||||
|
||||
# Machines for which we don't build the Xorg Xserver
|
||||
NO_XORG_MACHINES= alpha hppa64 landisk \
|
||||
octeon vax
|
||||
NO_XORG_MACHINES= alpha hppa64 landisk octeon
|
||||
|
||||
.for M in ${NO_XORG_MACHINES}
|
||||
NO_XORG_${M} = --disable-xorg
|
||||
|
||||
Reference in New Issue
Block a user