Bug#585618: mesa: FTBFS on kfreebsd and hurd (gallium/auxiliary: os/os_time.c:51:4: error: #error Unsupported OS

2010-06-13 Thread Julien Cristau 
Thanks for the patch.

On Sun, Jun 13, 2010 at 10:15:17 +0200, Cyril Brulebois wrote:

> --- a/src/gallium/auxiliary/os/os_time.c
> +++ b/src/gallium/auxiliary/os/os_time.c
> @@ -37,7 +37,7 @@
>  
>  #if !defined(PIPE_OS_EMBEDDED)
>  
> -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || 
> defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU)
> +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || 
> defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) 
> || defined(__GLIBC__)
>  #  include  /* timeval */
>  #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
>  #  include 

Should probably change src/gallium/include/pipe/p_config.h to set the
right PIPE_* defines, and check everywhere they're used that we're going
with the right path.

03:13 < jcristau> looks like there are 2 places where PIPE_OS_BSD and 
  PIPE_OS_LINUX do different things.  rtasm/rtasm_execmem.c we 
  want the linux path, and util/u_cpu_detect.c we want the bsd 
  path.. :)

I didn't check the PIPE_OS_FREEBSD uses.

Cheers,
Julien


signature.asc
Description: Digital signature

Bug#585618: mesa: FTBFS on kfreebsd and hurd (gallium/auxiliary: os/os_time.c:51:4: error: #error Unsupported OS

2010-06-13 Thread Cyril Brulebois 
Julien Cristau  (12/06/2010):
> Would be nice if porters could take a look.

Quick and dirty band-aid for kfreebsd attached. Please note that the
build is long enough that I only used '-nc' to continue the build once
that patch applied, instead of starting the build afresh.

Then fails with:
| # Classic DRI and Gallium DRI are mixed up together here
| # Remove the whole tree to avoid false-positives in --list-missing, and
| # install the right files manually.
| rm -r debian/tmp/usr/lib/dri
| # Radeon searches for r{200,300,600}_dri only, but the gallium driver
| # is (at the moment) radeong_dri.  Rename it to r300_dri, as it
| # fails to support r600.
| mv build/dri/glx/gallium/radeong_dri.so \
|   build/dri/glx/gallium/r300_dri.so
| mv: cannot stat `build/dri/glx/gallium/radeong_dri.so': No such file or 
directory
| make: *** [binary-arch] Error 1

I prefixed 'mv' with a dash to see if that goes further.

Then I got:
| dpkg-gensymbols: warning: debian/libgles1-mesa/DEBIAN/symbols doesn't match 
completely debian/libgles1-mesa.symbols
| --- debian/libgles1-mesa.symbols (libgles1-mesa_7.8.1-2_kfreebsd-i386)
| +++ dpkg-gensymbolsGyh1AU 2010-06-13 10:05:34.0 +0200
| @@ -1,6 +1,6 @@
|  libGLESv1_CM.so.1 libgles1-mesa #MINVER#
|   (regex)"^_glapi...@base$" 7.8.1
| - (regex|optional=mesa internal ASM optimized functions)"^_mesa...@base$" 
7.8.1
| +#MISSING: 7.8.1-2# (regex|optional=mesa internal ASM optimized 
functions)"^_mesa...@base$" 7.8.1
|   _glthread_ge...@base 7.8.1
|   glactivetext...@base 7.8.1
|   glalphaf...@base 7.8.1
| dpkg-gensymbols: warning: debian/libgles2-mesa/DEBIAN/symbols doesn't match 
completely debian/libgles2-mesa.symbols
| --- debian/libgles2-mesa.symbols (libgles2-mesa_7.8.1-2_kfreebsd-i386)
| +++ dpkg-gensymbolsC1BleL 2010-06-13 10:05:34.0 +0200
| @@ -1,6 +1,6 @@
|  libGLESv2.so.2 libgles2-mesa #MINVER#
|   (regex)"^_glapi...@base$" 7.8.1
| - (regex|optional=mesa internal ASM optimized functions)"^_mesa...@base$" 
7.8.1
| +#MISSING: 7.8.1-2# (regex|optional=mesa internal ASM optimized 
functions)"^_mesa...@base$" 7.8.1
|   _glthread_ge...@base 7.8.1
|   glactivetext...@base 7.8.1
|   glattachsha...@base 7.8.1

but got a successful build.

Mraw,
KiBi.
--- a/src/gallium/auxiliary/os/os_time.c
+++ b/src/gallium/auxiliary/os/os_time.c
@@ -37,7 +37,7 @@
 
 #if !defined(PIPE_OS_EMBEDDED)
 
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(__GLIBC__)
 #  include  /* timeval */
 #elif defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
 #  include 


signature.asc
Description: Digital signature

Bug#585618: mesa: FTBFS on kfreebsd and hurd (gallium/auxiliary: os/os_time.c:51:4: error: #error Unsupported OS

2010-06-12 Thread Christopher James Halse Rogers 
On Sat, 2010-06-12 at 13:59 +0200, Julien Cristau wrote:
> Package: mesa
> Version: 7.8.1-2
> Severity: serious
> 
> mesa in experimental ftbfs on kfreebsd and hurd:
> https://buildd.debian.org/pkg.cgi?pkg=mesa&maint=&dist=experimental
> 
> gcc -c -I. -I../../../src/gallium/include
> -I../../../src/gallium/auxiliary -I../../../src/gallium/drivers  -Wall
> -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math
> -fvisibility=hidden -fno-strict-aliasing  -fPIC   -D_GNU_SOURCE
> -DPTHREADS -DHAVE_POSIX_MEMALIGN -DGLX_USE_TLS -DPTHREADS
> -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_INDIRECT_RENDERING
> -DHAVE_ALIAS -D__STDC_CONSTANT_MACROS os/os_time.c -o os/os_time.o
> os/os_time.c:51:4: error: #error Unsupported OS
> os/os_time.c: In function 'os_time_get':
> os/os_time.c:93: warning: control reaches end of non-void function
> make[4]: *** [os/os_time.o] Error 1
> 
> Would be nice if porters could take a look.  Otherwise we can disable
> gallium there (I thought we already did, but apparently not).

We only build the DRI drivers on Linux but we do build gallium swrast
everywhere.



signature.asc
Description: This is a digitally signed message part

Bug#585618: mesa: FTBFS on kfreebsd and hurd (gallium/auxiliary: os/os_time.c:51:4: error: #error Unsupported OS

2010-06-12 Thread Julien Cristau 
Package: mesa
Version: 7.8.1-2
Severity: serious

mesa in experimental ftbfs on kfreebsd and hurd:
https://buildd.debian.org/pkg.cgi?pkg=mesa&maint=&dist=experimental

gcc -c -I. -I../../../src/gallium/include
-I../../../src/gallium/auxiliary -I../../../src/gallium/drivers  -Wall
-g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math
-fvisibility=hidden -fno-strict-aliasing  -fPIC   -D_GNU_SOURCE
-DPTHREADS -DHAVE_POSIX_MEMALIGN -DGLX_USE_TLS -DPTHREADS
-DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_INDIRECT_RENDERING
-DHAVE_ALIAS -D__STDC_CONSTANT_MACROS os/os_time.c -o os/os_time.o
os/os_time.c:51:4: error: #error Unsupported OS
os/os_time.c: In function 'os_time_get':
os/os_time.c:93: warning: control reaches end of non-void function
make[4]: *** [os/os_time.o] Error 1

Would be nice if porters could take a look.  Otherwise we can disable
gallium there (I thought we already did, but apparently not).

Cheers,
Julien


signature.asc
Description: Digital signature