Jon TURNEY <jon.tur...@dronecode.org.uk> writes: > On 17/07/2012 16:48, Jon TURNEY wrote: >> On 17/07/2012 06:55, Dave Airlie wrote: >>> In Fedora we've always built both osmesa and GL versions of mesa, we >>> used to do this in two passes but its been possible for a while to do >>> this in a single pass, and it seems to work. >>> >>> However now src/mesa/Makefile.am contains this: >>> >>> if HAVE_OSMESA_DRIVER >>> pkgconfig_DATA = osmesa.pc >>> else >>> pkgconfig_DATA = gl.pc >>> endif >>> >>> >>> so when we go to finish packaging we don't get gl.pc anymore. >>> >>> Any ideas? >> >> Yes, it looks like commit 39785488 indirectly broke this. >> >> http://lists.freedesktop.org/archives/mesa-dev/2012-July/023720.html has a >> patch. >> >> Although really it might make more sense to move osmesa.pc.in down to >> drivers/osmesa and do it all there > > How about the attached patch?
> +pkgconfigdir = $(libdir)/pkgconfig > +if HAVE_OSMESA_DRIVER > +pkgconfig_DATA = osmesa.pc > +endif No need for HAVE_OSMESA_DRIVER test there, since you are only in this directory if HAVE_OSMESA_DRIVER, and the rest of the file is for building and installing the library that goes with the .pc. Other than that, Reviewed-by: Eric Anholt <e...@anholt.net>
pgpjh93dmMtPf.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
