[Mesa-dev] can't build/install osmesa and gl at same time

[Jon TURNEY]

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?

-------------- next part --------------
>From f20f94f44171a4761750ce9e23eef2086aad118e Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu, 26 Jul 2012 11:07:37 +0100
Subject: [PATCH] Move installing osmesa.pc to drivers/osmesa

Move installing osmesa.pc to drivers/osmesa, where it belongs better

This also restores the installation of gl.pc if we are building osmesa at the
same time as libGL, which was broken in commit 39785488 when the .pc
installation was converted to automake

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 configure.ac                               |    2 +-
 src/mesa/Makefile.am                       |    5 -----
 src/mesa/drivers/osmesa/Makefile.am        |    5 +++++
 src/mesa/{ => drivers/osmesa}/osmesa.pc.in |    0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename src/mesa/{ => drivers/osmesa}/osmesa.pc.in (100%)

diff --git a/configure.ac b/configure.ac
index 6ea1a69..3a67413 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2204,7 +2204,7 @@ AC_CONFIG_FILES([configs/current
 		src/mesa/drivers/osmesa/Makefile
 		src/mesa/drivers/x11/Makefile
 		src/mesa/gl.pc
-		src/mesa/osmesa.pc])
+		src/mesa/drivers/osmesa/osmesa.pc])
 
 dnl Sort the dirs alphabetically
 GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "`
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 584458b..48aa6c6 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -144,12 +144,7 @@ all-local: libmesa.la libmesagallium.la
 CLEANFILES += libmesa.a libmesagallium.a
 
 pkgconfigdir = $(libdir)/pkgconfig
-
-if HAVE_OSMESA_DRIVER
-pkgconfig_DATA = osmesa.pc
-else
 pkgconfig_DATA = gl.pc
-endif
 
 # Emacs tags
 tags:
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index a698ad8..0ea6396 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -46,3 +46,8 @@ lib at OSMESA_LIB@_la_LIBADD = \
 # a while by putting a link to the driver into /lib of the build tree.
 all-local: lib at OSMESA_LIB@.la
 	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+
+pkgconfigdir = $(libdir)/pkgconfig
+if HAVE_OSMESA_DRIVER
+pkgconfig_DATA = osmesa.pc
+endif
diff --git a/src/mesa/osmesa.pc.in b/src/mesa/drivers/osmesa/osmesa.pc.in
similarity index 100%
rename from src/mesa/osmesa.pc.in
rename to src/mesa/drivers/osmesa/osmesa.pc.in
-- 
1.7.9