On Wed, Sep 26, 2012 at 2:50 PM, Török Edwin <edwin+ml-mesa...@etorok.net> wrote: > On 09/26/2012 11:59 PM, Matt Turner wrote: >> I've pushed an automake-gallium2 branch to my repo with a number of >> fixes squashed-in. >> >> git://people.freedesktop.org/~mattst88/mesa automake-gallium2 > > Nice progress! > > I was able to build it after reversing the 'if' below.
Weird. I don't have this problem. > It doesn't load though: > libGL: OpenDriver: trying opt/xorg/lib/dri/r600_dri.so > libGL error: dlopen opt/xorg/lib/dri/r600_dri.so failed > (opt/xorg/lib/dri/r600_dri.so: undefined symbol: > _ZN4llvm13ParseAssemblyEPNS_12MemoryBufferEPNS_6ModuleERNS_12SMDiagnosticERNS_11LLVMContextE) Tom, are there some extra LLVM libs that need to be linked in, or is this a problem caused by switching the if statement? I'm not able to reproduce this locally (with LLVM-3.1). > diff --git a/src/gallium/drivers/radeon/Makefile.am > b/src/gallium/drivers/radeon/Makefile.am > index d0e0ec3..668ad5f 100644 > --- a/src/gallium/drivers/radeon/Makefile.am > +++ b/src/gallium/drivers/radeon/Makefile.am > @@ -28,9 +28,9 @@ SIRegisterGetHWRegNum.inc: SIGenRegisterInfo.pl > > R600Intrinsics.td: R600IntrinsicsNoOpenCL.td R600IntrinsicsOpenCL.td > if HAVE_R600_LLVM_INTRINSICS > - cp $(srcdir)/R600IntrinsicsNoOpenCL.td R600Intrinsics.td > -else > cp $(srcdir)/R600IntrinsicsOpenCL.td R600Intrinsics.td > +else > + cp $(srcdir)/R600IntrinsicsNoOpenCL.td R600Intrinsics.td > endif > > However it still seems to be missing a dependency as rerunning configure > doesn't cause the .td file to be copied, had to manually remove it. Tom's area. Let's see what he thinks. > Another issue is that the yacc-generated files are not removed by 'make > clean', > but thats probably on purpose (do the generated files get shipped in the > release tarball?), > I should've run 'make distclean'. Specifically program_parse.c and program_lexer.c, right? I'm not sure whether yacc- and lex-generated files should be removed by make clean. I'm inconsistent about this -- I don't remove the program files, but I do remove the glsl/glcpp files on make clean. However, they should be shipped in the tarball. > But 'make distclean' fails so I had to manually remove those generated files: > make[3]: Entering directory > `/home/edwin/HDD/me/language/C++/xorg/mesa/src/gallium/winsys/sw/fbdev' > make[3]: *** No rule to make target `distclean'. Stop. Interesting. I can reproduce this. It looks related to the way configure.ac substitutes subdirs into the Makefile (which is wrong). configure.ac appends sw/fbdev to GALLIUM_WINSYS_DIRS but also I add fbdev to SUBDIRS in src/gallium/winsys/sw. I'll figure out how to fix that. Again, thanks for testing! Matt _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
