diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-24 22:40:12 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-24 22:40:12 +0000 |
commit | 62bf4ede03217aaaf651178b1f4d6d4adb8cbf55 (patch) | |
tree | cdbfe58034e7d604455f8ba34d62cf1632e3a718 | |
parent | 6462bd4c1515584544fd084ddcc86d24108c32a9 (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/24 23:24:51+01:00 handhelds.org!zecke
SDL Perl:
Move the sdl-perl patch from Pigi to the right directory. Allow building
of sdl-perl for all gui environments
2005/02/24 23:23:25+01:00 handhelds.org!zecke
Frozen Bubble:
-Apply Pigis patches to frozen-bubble to make it build
BKrev: 421e57cc3v7zBoegz_7PMKmoHdRjyg
-rw-r--r-- | packages/frozen-bubble/Makefile_top.patch (renamed from packages/sdl-perl/sdl-perl_1.20.3.bb) | 0 | ||||
-rw-r--r-- | packages/frozen-bubble/frozen-bubble_1.0.0.bb | 19 | ||||
-rw-r--r-- | packages/sdlperl/sdl-perl_1.20.3.bb | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/packages/sdl-perl/sdl-perl_1.20.3.bb b/packages/frozen-bubble/Makefile_top.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/sdl-perl/sdl-perl_1.20.3.bb +++ b/packages/frozen-bubble/Makefile_top.patch diff --git a/packages/frozen-bubble/frozen-bubble_1.0.0.bb b/packages/frozen-bubble/frozen-bubble_1.0.0.bb index e69de29bb2..f8ee64aca0 100644 --- a/packages/frozen-bubble/frozen-bubble_1.0.0.bb +++ b/packages/frozen-bubble/frozen-bubble_1.0.0.bb @@ -0,0 +1,19 @@ +LICENSE = GPL +SECTION = "opie/games" +DEPENDS = "libsdl-mixer libsdl-image sdl-perl" + +SRC_URI = "http://zarb.org/~gc/fb//frozen-bubble-${PV}.tar.bz2 \ + file://Makefile_top.patch;patch=1 \ + file://Makefile.patch;patch=1 \ + file://Makefile.PL.patch;patch=1" +# The Makefile needs to be patched to look in STAGING_LIBDIR/perl/... - It's looking in i686-linux/lib at the moment, regardless of arch +BROKEN = "1" + + +do_compile() { + oe_runmake OPTIMIZE="${CFLAGS}" PREFIX="${prefix}" +} + +do_install() { + oe_runmake PREFIX="${D}${prefix}" install +} diff --git a/packages/sdlperl/sdl-perl_1.20.3.bb b/packages/sdlperl/sdl-perl_1.20.3.bb index d85d11cc2d..d115f02ce3 100644 --- a/packages/sdlperl/sdl-perl_1.20.3.bb +++ b/packages/sdlperl/sdl-perl_1.20.3.bb @@ -4,9 +4,9 @@ SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0" S = "${WORKDIR}/SDL_perl-${PV}" LICENSE = "GPL" -DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg mesa" +DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg" -inherit cpan +inherit sdl do_stage () { install -d ${STAGING_LIBDIR}/perl5/vendor_perl |