diff options
| author | Jeremy Laine <jeremy.laine@m4x.org> | 2008-08-27 16:22:56 +0000 |
|---|---|---|
| committer | Jeremy Laine <jeremy.laine@m4x.org> | 2008-08-27 16:22:56 +0000 |
| commit | 5a60e8d2d9220e02966c8cf776b5c593831f345b (patch) | |
| tree | 7169a07202027012eb5b1a77a2a91bfffefdbcb0 | |
| parent | ab3f80ebb0215321f9ce226ce54438492be8ab5e (diff) | |
| parent | 4b0b97806315711698523175461283205eda3918 (diff) | |
merge of '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
and '45a9c4a970e79c5b8343a4a4ff110589bcc19d2f'
| -rw-r--r-- | classes/scratchbox-compat.bbclass | 13 | ||||
| -rw-r--r-- | packages/python/python-connexion_svn.bb | 5 | ||||
| -rw-r--r-- | packages/python/python-pygame_1.8.1.bb | 4 |
3 files changed, 19 insertions, 3 deletions
diff --git a/classes/scratchbox-compat.bbclass b/classes/scratchbox-compat.bbclass new file mode 100644 index 0000000000..6cf92bde5d --- /dev/null +++ b/classes/scratchbox-compat.bbclass @@ -0,0 +1,13 @@ +# By adding this class to your build all binaries get the special rpath +# "/scratchbox/host_shared/lib/:/scratchbox/tools/lib/" +# Doing so makes libraries and programs runnable inside the Scratchbox +# environment as native binaries (not for the CPU that Scratchbox is +# emulating). + +do_configure_prepend () { + export LD_RUN_PATH="/scratchbox/host_shared/lib:/scratchbox/tools/lib" +} + +do_compile_prepend () { + export LD_RUN_PATH="/scratchbox/host_shared/lib:/scratchbox/tools/lib" +} diff --git a/packages/python/python-connexion_svn.bb b/packages/python/python-connexion_svn.bb index 017de940e8..ae546f5256 100644 --- a/packages/python/python-connexion_svn.bb +++ b/packages/python/python-connexion_svn.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "GPL" BV = "0.4.6" PV = "${BV}+svnr${SRCREV}" -PR = "ml0" +PR = "ml1" inherit distutils @@ -24,3 +24,6 @@ do_install() { cd ${S}/$i && distutils_do_install done } + +RDEPENDS_${PN} += "python-ctypes" + diff --git a/packages/python/python-pygame_1.8.1.bb b/packages/python/python-pygame_1.8.1.bb index dc3f431964..71eff50dfb 100644 --- a/packages/python/python-pygame_1.8.1.bb +++ b/packages/python/python-pygame_1.8.1.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric" SRCNAME = "pygame" -PR = "ml0" +PR = "ml1" SRC_URI = "\ ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \ @@ -16,7 +16,7 @@ inherit distutils do_configure_prepend() { cat ${WORKDIR}/Setup >Setup - SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >Setup + SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >>Setup } do_stage() { |