frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Solaris build with Sun compilers to work when exa is built before 

hw/xfree86/os-support/solaris (as it is by default now).
This commit is contained in:
Alan Coopersmith 2006-05-02 01:37:25 +00:00
parent 724dbc2f8b
commit 1e8a594957
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-05-01 Alan Coopersmith <alan.coopersmith@sun.com>
* configure.ac:
* exa/Makefile.am:
Fix Solaris build with Sun compilers to work when exa is built before
hw/xfree86/os-support/solaris (as it is by default now).
2006-05-01 Alan Coopersmith <alan.coopersmith@sun.com> 2006-05-01 Alan Coopersmith <alan.coopersmith@sun.com>
* os/WaitFor.c: * os/WaitFor.c:

3
configure.ac
View File

@ -1142,7 +1142,8 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
esac esac
AC_SUBST([SOLARIS_INOUT_ARCH]) AC_SUBST([SOLARIS_INOUT_ARCH])
if test x$solaris_asm_inline = xyes ; then if test x$solaris_asm_inline = xyes ; then
XORG_CFLAGS="${XORG_CFLAGS} "'$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-${SOLARIS_INOUT_ARCH}.il' SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il'
XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'
fi fi
;; ;;
*) *)

4
exa/Makefile.am
View File

@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libexa.la noinst_LTLIBRARIES = libexa.la
# Override these since EXA doesn't need them and the needed files aren't
# built (in hw/xfree86/os-support/solaris) until after EXA is built
SOLARIS_ASM_CFLAGS=""
if XORG if XORG
sdk_HEADERS = exa.h sdk_HEADERS = exa.h
endif endif