diff options
author | Raymond Danks <raymond@edanks.com> | 2006-07-24 16:14:43 +0000 |
---|---|---|
committer | Raymond Danks <raymond@edanks.com> | 2006-07-24 16:14:43 +0000 |
commit | 03ed24fd55e522465ea04368e7b727300ad8d595 (patch) | |
tree | 1fe4c33465a2ef05a8ac219ecb2414c35f61cbd1 /packages/mesa/mesa_6.4.1+cvs20060101.bb | |
parent | 726016c3d5faac212552737f41b0dd479c7786d7 (diff) |
mesa - Move library dependencies from RDEPENDS to DEPENDS.
- Update build config instead of using environment to override toolchain vars.
- mklib patch for understanding -Wl linker flags.
- mesa depends upon makedepend-native.
Diffstat (limited to 'packages/mesa/mesa_6.4.1+cvs20060101.bb')
-rw-r--r-- | packages/mesa/mesa_6.4.1+cvs20060101.bb | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb index 788b8d3cef..164f62648f 100644 --- a/packages/mesa/mesa_6.4.1+cvs20060101.bb +++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb @@ -3,19 +3,33 @@ SECTION = "unknown" SRCDATE = "20060101" PV = "6.4.1+cvs${SRCDATE}" -SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE}" +SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \ + file://mklib-rpath-link.patch;patch=1" S = "${WORKDIR}/Mesa" LICENSE = "LGPL" -RDEPENDS = "expat libx11 libxext libxxf86vm libxi libxmu libice" -DEPENDS = "xf86vidmodeproto glproto" +RDEPENDS = "expat" +DEPENDS = "makedepend-native xf86vidmodeproto glproto libx11 libxext libxxf86vm libxi libxmu libice" # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}" +do_configure() { + cd configs + + ln -sf linux current + sed -e "s%CC *= *.*%CC = ${CC}%" -i current + sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current + sed -e "s%LD *= *.*%LD = ${LD}%" -i current + sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current + sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current + sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current + echo "SRC_DIRS = mesa glu glut/glx" >> current +} + do_compile() { - oe_runmake linux CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" + oe_runmake default } do_install() { |