[Mesa-dev] [RFC] Merge automake branch

Johannes Obermayr johannesobermayr at gmx.de
Sat Dec 22 04:51:31 PST 2012


Am Samstag, 22. Dezember 2012, 02:12:55 schrieb Michel Dänzer:
> On Sam, 2012-12-22 at 01:06 +0100, Johannes Obermayr wrote: 
> > Am Samstag, 22. Dezember 2012, 00:31:16 schrieb Michel Dänzer:
> > > On Fre, 2012-12-21 at 22:43 +0100, Johannes Obermayr wrote: 
> > > > Am Freitag, 21. Dezember 2012, 16:48:59 schrieb Michel Dänzer:
> > > > > On Fre, 2012-12-21 at 06:31 +0100, Johannes Obermayr wrote: 
> > > > > > 
> > > > > > Please pull the code from:
> > > > > > git://github.com/jobermayr/mesa.git  branch: master
> > > > > > 
> > > > > > To view it online:
> > > > > > https://github.com/jobermayr/mesa
> > > > > > 
> > > > > > Following changes since automake-gallium6:
> > > > > > - link shared libgallium against some LLVM libs
> > > > > > - drivers/radeon must be build shared to fix egl_gallium.so on r600/radeonsi builds
> > > > > > - radeonsi and clover/opencl can be built against LLVM 3.3 trunk
> > > > > > - merged some commits
> > > > > > - based on current git master
> > > > > 
> > > > > Sounds good. Sorry to be the bearer of bad news again, but it fails to
> > > > > build --with-llvm-shared-libs:
> > > > > 
> > > > > make[4]: Entering directory `/home/daenzer/src/mesa-git/mesa/src/gallium/auxiliary'
> > > > > make[4]: *** No rule to make target `-lLLVM-3.2svn', needed by `libgallium9.1.0.la'.  Stop.
> > > > > 
> > > > 
> > > > Rebased automake branch.
> > > > 
> > > > Following improvements:
> > > > 
> > > > - add $(LLVM_LDFLAGS) to libgallium at VERSION@_la_LDFLAGS to find
> > > > -lLLVM-3.2svn in a non-default dir (should solve Michel's issue)
> > > 
> > > libgallium builds now, thanks.
> > > 
> > > 
> > > > I am looking forward to get another to solve "setback" from Michel :-)
> > > 
> > > libllvmradeon fails to build with hundreds of unresolved LLVM symbols,
> > > see below.
> > > 
> > > 
> > >   CXXLD  libllvmradeon9.1.0.la
> > <snip>
> > 
> > rebased again:
> > Added $(LLVM_LDFLAGS) to libllvmradeon at VERSION@_la_LDFLAGS -> maybe enough
> > 
> > Additionally added $(LLVM_LIBS), $(DLOPEN_LIBS) and $(CLOCK_LIB) to libllvmradeon at VERSION@_la_LIBADD
> > -> Please try whether these are really needed.
> 
> $(LLVM_LIBS) and $(CLOCK_LIB) are needed for me, $(DLOPEN_LIBS) isn't.
> 
> 
> Thanks,
> 

Rebased it again.

Removed $(DLOPEN_LIBS) - we should add it again if sb. really needs it.

Merged targets/pipe-loader v3 and v4 to benefit at the right place:
https://github.com/jobermayr/mesa/commit/67abcf095a111d35ecb21d5da100f7a7b1b6bc22

Matt, you should be able to merge it to master now. :-)


More information about the mesa-dev mailing list