[Mesa-dev] build fail after recent changes

[Andy Furniss]

make distclean
git clean -dfx
git pull

./autogen.sh --prefix=/usr --disable-egl --enable-texture-float 
--enable-gallium-g3dvl --enable-r600-llvm-compiler 
--with-gallium-drivers=r600,swrast --with-dri-drivers= && make -j5

(get fail and run just make again)


Making all in dri-r600
make[3]: Entering directory 
`/mnt/sdb1/Src64/Mesa-git/mesa/src/gallium/targets/dri-r600'
   GEN      r600_dri.la
../../../../src/gallium/drivers/r600/.libs/libr600.a(cso_cache.o): In 
function `hash_key':
/mnt/sdb1/Src64/Mesa-git/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c:57: 
multiple definition of `cso_construct_key'
../../../../src/gallium/auxiliary/.libs/libgallium.a(cso_cache.o):/mnt/sdb1/Src64/Mesa-git/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c:57: 
first defined here
../../../../src/gallium/drivers/r600/.libs/libr600.a(cso_cache.o): In 
function `_cso_hash_for_type':
/mnt/sdb1/Src64/Mesa-git/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c:86: 
multiple definition of `cso_insert_state'

1000s of similar lines

/mnt/sdb1/Src64/Mesa-git/mesa/src/gallium/auxiliary/vl/vl_zscan.c:571: 
multiple definition of `vl_zscan_render'
../../../../src/gallium/auxiliary/.libs/libgallium.a(vl_zscan.o):/mnt/sdb1/Src64/Mesa-git/mesa/src/gallium/auxiliary/vl/vl_zscan.c:571: 
first defined here
../../../../src/gallium/drivers/r600/.libs/libr600.a(vl_zscan.o):(.rodata+0x0): 
multiple definition of `vl_zscan_alternate'
../../../../src/gallium/auxiliary/.libs/libgallium.a(vl_zscan.o):(.rodata+0x0): 
first defined here
../../../../src/gallium/drivers/r600/.libs/libr600.a(vl_zscan.o):(.rodata+0x100): 
multiple definition of `vl_zscan_normal'
../../../../src/gallium/auxiliary/.libs/libgallium.a(vl_zscan.o):(.rodata+0x100): 
first defined here
../../../../src/gallium/drivers/r600/.libs/libr600.a(vl_zscan.o):(.rodata+0x200): 
multiple definition of `vl_zscan_linear'
../../../../src/gallium/auxiliary/.libs/libgallium.a(vl_zscan.o):(.rodata+0x200): 
first defined here
collect2: ld returned 1 exit status
make[3]: *** [r600_dri.la] Error 1
make[3]: Leaving directory 
`/mnt/sdb1/Src64/Mesa-git/mesa/src/gallium/targets/dri-r600'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory 
`/mnt/sdb1/Src64/Mesa-git/mesa/src/gallium/targets'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/mnt/sdb1/Src64/Mesa-git/mesa/src'
make: *** [all-recursive] Error 1