qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build the Xserver with large got (-xgot as(1) option) on mips; needed to

Browse Source 
accomodate the growth of recent changes. Tested on loongson.
This commit is contained in:
miod 2015-06-27 21:50:55 +00:00
parent 0eb3c16128
commit 67eafd3844
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kdrive/Makefile.bsd-wrapper
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.17 2014/02/07 19:40:52 bcallah Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.18 2015/06/27 21:50:55 miod Exp $
.include <bsd.xconf.mk>
@ -23,4 +23,10 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
realinstall:
(cd hw/kdrive/ephyr ; make install)
.if ${MACHINE_CPU} == "mips64"
# disable cache file, because the compiler flags will not match
CONFIGURE_ARGS+= --cache-file=/dev/null
CFLAGS+= -Wa,-xgot
.endif
.include <bsd.xorg.mk>

17
xserver/Makefile.bsd-wrapper
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.54 2015/05/31 13:23:03 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.55 2015/06/27 21:50:55 miod Exp $
.include <bsd.xconf.mk>
@ -8,18 +8,11 @@ DIST= ${.CURDIR}
NO_XORG_MACHINES= alpha aviion hppa64 landisk \
octeon solbourne vax
NO_XF86UTIL_MACHINES= landisk luna88k mac68k octeon sgi sparc vax
.for M in ${NO_XORG_MACHINES}
NO_XORG_${M} = --disable-xorg
.endfor
NO_XORG_OPTION=${NO_XORG_${MACHINE}}
.for M in ${NO_XF86UTIL_MACHINES}
NO_XF86_UTIL_${M} = --disable-xfree86-utils
.endfor
NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}}
.if ${XENOCARA_BUILD_GL:L} != "yes"
GLX_OPTION= --disable-glx
.endif
@ -41,8 +34,14 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--enable-install-setuid --enable-privsep \
--enable-xcsecurity \
--without-fop --without-xmlto --without-xsltproc \
--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \
--disable-dmx ${NO_XORG_OPTION} \
--disable-unit-tests \
${DRI_OPTION}
.if ${MACHINE_CPU} == "mips64"
# disable cache file, because the compiler flags will not match
CONFIGURE_ARGS+= --cache-file=/dev/null
CFLAGS+= -Wa,-xgot
.endif
.include <bsd.xorg.mk>