[pkgsrc/trunk]: pkgsrc/graphics/Mesa Partial fixes for cross-compilation.

[riastradh <riastradh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80c57f152ce9
branches:  trunk
changeset: 646736:80c57f152ce9
user:      riastradh <riastradh%pkgsrc.org@localhost>
date:      Sat Feb 14 06:54:14 2015 +0000

description:
Partial fixes for cross-compilation.

- Python is a tool, not build, dependency.
- Incomplete workaround for mesa's own tools.

diffstat:

 graphics/Mesa/Makefile.lib |  20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r 63ef5a6f984f -r 80c57f152ce9 graphics/Mesa/Makefile.lib
--- a/graphics/Mesa/Makefile.lib        Sat Feb 14 06:51:33 2015 +0000
+++ b/graphics/Mesa/Makefile.lib        Sat Feb 14 06:54:14 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.19 2014/10/09 14:06:34 wiz Exp $
+# $NetBSD: Makefile.lib,v 1.20 2015/02/14 06:54:14 riastradh Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -18,7 +18,7 @@
 USE_LANGUAGES=         c99 c++
 USE_TOOLS+=            automake bison flex gmake pkg-config makedepend
 
-PYTHON_FOR_BUILD_ONLY=  yes
+PYTHON_FOR_BUILD_ONLY=  tool
 PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 7.11.2
 .include "../../lang/python/tool.mk"
 BUILDLINK_DEPMETHOD.libxml2?=   build
@@ -44,5 +44,21 @@
 BUILDLINK_TRANSFORM+=  rm:-fvisibility=hidden
 .endif
 
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+# XXX This is not quite enough: we will need to patch the makefile
+# because it bogusly tries to reuse objects for native tools and target
+# libraries, and for cross-compiling the objects need to be built
+# separately.  Alternatively, we could just update Mesa to something
+# less prehistoric...
+SUBST_CLASSES+=                nativecc
+SUBST_STAGE.nativecc=  pre-configure
+SUBST_MESSAGE.nativecc=        Fix makefiles to compile tools with native cc.
+SUBST_FILES.nativecc+= src/glsl/Makefile
+SUBST_SED.nativecc+=   -e 's,$$(CC),$$(APP_CC),g'
+SUBST_SED.nativecc+=   -e 's,$$(CXX),$$(APP_CXX),g'
+MAKE_FLAGS+=           APP_CC=${NATIVE_CC:Q}
+MAKE_FLAGS+=           APP_CXX=${NATIVE_CXX:Q}
+.endif
+
 pre-configure:
        cd ${WRKSRC} && ${MAKE} configure