diff options
| author | Michael Smith <msmith@cbnco.com> | 2009-07-13 14:59:40 -0400 |
|---|---|---|
| committer | Michael Smith <msmith@cbnco.com> | 2009-08-24 12:29:55 -0400 |
| commit | dc929c2ebce4bd676cf725f9972de9604ed2db4d (patch) | |
| tree | 5146bae7be716a50cfce69fe4f8fe814d6b7fbc7 /recipes/mesa/mesa-common.inc | |
| parent | 111ed2d52569e4865a5cd32fcbefce78c46f8565 (diff) | |
mesa-dri: set PACKAGE_ARCH to ${MACHINE}
${MACHINE_DRI_MODULES} is passed to configure, so the package output
depends on MACHINE. As foretold by commit f06119fc :)
Also switch to INC_PR and fix built of mesa-xprogs when prefix != /usr.
Signed-off-by: Michael Smith <msmith@cbnco.com>
Diffstat (limited to 'recipes/mesa/mesa-common.inc')
| -rw-r--r-- | recipes/mesa/mesa-common.inc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index 9cd10eb3e3..4f18c2f710 100644 --- a/recipes/mesa/mesa-common.inc +++ b/recipes/mesa/mesa-common.inc @@ -4,6 +4,8 @@ DESCRIPTION = "An open source implementation of the OpenGL spec" HOMEPAGE = "http://mesa3d.org" LICENSE = "MIT" +INC_PR = "r7" + SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " S = "${WORKDIR}/Mesa-${PV}" @@ -20,6 +22,9 @@ EXTRA_OECONF = "--enable-glu \ require mesa-tls.inc EXTRA_OECONF += "${@get_tls_setting(bb, d)} " +# Package contents vary according to ${MACHINE_DRI_MODULES}. +PACKAGE_ARCH = "${MACHINE}" + PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" FILES_libgl = "${libdir}/libGL.so.*" FILES_libglu = "${libdir}/libGLU.so.*" @@ -36,4 +41,7 @@ do_stage() { cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/ } - +do_install_append () { + install -d ${D}/${bindir} + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} +} |