summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-04 08:44:33 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-04 09:06:11 +0000
commitd880498b44107e847a5da94b37a61b60fb0db446 (patch)
treefc5378dec6874bf6c8d589ca6070385bda28f0e6
parentf64dd91f4f2a2591e66b38fdfdfa83077f8221ab (diff)
downloadmesa-baserock/genivi/morph-generic.tar.gz
Make the morphologies genieric.baserock/genivi/morph-generic
This is possible adding a script "morph-arch-config" which decides the configuration depending on the architecture.
-rw-r--r--mesa-wayland.morph2
-rw-r--r--mesa-x.morph2
-rw-r--r--morph-arch-config10
3 files changed, 12 insertions, 2 deletions
diff --git a/mesa-wayland.morph b/mesa-wayland.morph
index 545e4b11298..e4f46d37e8f 100644
--- a/mesa-wayland.morph
+++ b/mesa-wayland.morph
@@ -3,6 +3,6 @@
"kind": "chunk",
"build-system": "autotools",
"configure-commands": [
- "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=wayland,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=intel,i915,i965,swrast"
+ "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=wayland,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast $(./morph-arch-config)"
]
}
diff --git a/mesa-x.morph b/mesa-x.morph
index 7dc57638401..6346577c218 100644
--- a/mesa-x.morph
+++ b/mesa-x.morph
@@ -3,6 +3,6 @@
"kind": "chunk",
"build-system": "autotools",
"configure-commands": [
- "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=x11,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=intel,i915,i965,swrast"
+ "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=x11,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast $(./morph-arch-config)"
]
}
diff --git a/morph-arch-config b/morph-arch-config
new file mode 100644
index 00000000000..d8e60ac30be
--- /dev/null
+++ b/morph-arch-config
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# morph-arch-config: ouput MESA-specific configuration for specific
+# Morph architectures
+
+# Morph's armv7* architecture is always armv7-a
+case "$MORPH_ARCH" in
+ armv7*) echo "--with-dri-drivers=swrast" ;;
+ x86*) echo "--with-dri-drivers=intel,i915,i965,swrast" ;;
+esac