[Mesa-dev] [PATCH:mesa] swrast: Build fix for Solaris

[Alan Coopersmith]

Ah yes, I see Jons patch now in
https://bugs.freedesktop.org/show_bug.cgi?id=90147#c9

That looks like it should work for Solaris too, so whichever the
Mesa developers prefer...

	-alan-

On 05/15/15 07:16 PM, Jeremy Huddleston Sequoia wrote:
> Looks right to me.  I think this was also mentioned in the bugzilla ticket where this change was committed from.
>
> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
>
>> On May 15, 2015, at 19:05, Alan Coopersmith <alan.coopersmith at oracle.com> wrote:
>>
>> Fixes regression from commit 5b2d3480f57168d50ad24cf0b8c9244414bd3701
>>
>> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
>> CC: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
>> ---
>> configure.ac                         |    1 +
>> src/mesa/drivers/dri/swrast/swrast.c |    4 +++-
>> 2 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index cd3ba35..135dcb4 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -651,6 +651,7 @@ if test "x$enable_asm" = xyes; then
>> fi
>>
>> AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"])
>> +AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
>> AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
>>
>> dnl Check to see if dlopen is in default libraries (like Solaris, which
>> diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
>> index cbc946c..2d4bb70 100644
>> --- a/src/mesa/drivers/dri/swrast/swrast.c
>> +++ b/src/mesa/drivers/dri/swrast/swrast.c
>> @@ -62,7 +62,9 @@
>> #include "swrast/s_context.h"
>>
>> #include <sys/types.h>
>> -#include <sys/sysctl.h>
>> +#ifdef HAVE_SYS_SYSCTL_H
>> +# include <sys/sysctl.h>
>> +#endif
>>
>> const __DRIextension **__driDriverGetExtensions_swrast(void);
>>
>> --
>> 1.7.9.2
>>
>


-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc