diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-04-13 13:06:22 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-13 13:06:22 +0000 |
| commit | 77a6f4f731f2b331f03f491ba28c4795555bac32 (patch) | |
| tree | 1e2a72274600c1c624143ad0fb924eb0a9989387 | |
| parent | 76f0fff10ab49dd36440499cd1b2304840d150d7 (diff) | |
| parent | 2a5cc04f1a106d2d531ebaef81331fdba92d241b (diff) | |
merge of 868e3092c931e12c4f9d694ad7df1311a37a82fd
and 4813ca2ee55d62f418589078bde8c65471daf1c4
| -rw-r--r-- | packages/busybox/slingbox-1.00/defconfig | 2 | ||||
| -rw-r--r-- | packages/busybox/slingbox_1.00.bb | 2 | ||||
| -rw-r--r-- | packages/python/python_2.3.4.bb | 3 | ||||
| -rw-r--r-- | packages/python/python_2.4.3.bb | 4 | ||||
| -rw-r--r-- | packages/sdlperl/sdl-perl_1.20.3.bb | 40 |
5 files changed, 39 insertions, 12 deletions
diff --git a/packages/busybox/slingbox-1.00/defconfig b/packages/busybox/slingbox-1.00/defconfig index d35d7d5956..6b15e1944b 100644 --- a/packages/busybox/slingbox-1.00/defconfig +++ b/packages/busybox/slingbox-1.00/defconfig @@ -311,7 +311,7 @@ CONFIG_FREERAMDISK=y # CONFIG_GETOPT is not set CONFIG_HEXDUMP=y # CONFIG_HWCLOCK is not set -# CONFIG_LOSETUP is not set +CONFIG_LOSETUP=y # CONFIG_MKSWAP is not set # CONFIG_MORE is not set CONFIG_PIVOT_ROOT=y diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb index a275cbbc73..8e11a09e6c 100644 --- a/packages/busybox/slingbox_1.00.bb +++ b/packages/busybox/slingbox_1.00.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r8" +PR = "r9" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ diff --git a/packages/python/python_2.3.4.bb b/packages/python/python_2.3.4.bb index de9c15c350..e6da09e48f 100644 --- a/packages/python/python_2.3.4.bb +++ b/packages/python/python_2.3.4.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "python-native zlib gdbm" -PR = "ml4" +PR = "ml5" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://bindir-libdir.patch;patch=1 \ @@ -55,3 +55,4 @@ do_install() { } include python-${PV}-manifest.inc +RPROVIDES_python-core = "python" diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 7d3856d719..600bee2df6 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" -PR = "ml0" +PR = "ml1" PYTHON_MAJMIN = "2.4" @@ -62,6 +62,6 @@ do_install() { include python-${PV}-manifest.inc +RPROVIDES_python-core = "python" PACKAGES =+ "libpython2" FILES_libpython2 = "${libdir}/libpython*" - diff --git a/packages/sdlperl/sdl-perl_1.20.3.bb b/packages/sdlperl/sdl-perl_1.20.3.bb index d115f02ce3..80bd899dfc 100644 --- a/packages/sdlperl/sdl-perl_1.20.3.bb +++ b/packages/sdlperl/sdl-perl_1.20.3.bb @@ -1,14 +1,40 @@ -SECTION = "libs" DESCRIPTION = "Perl bindings for SDL" -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}" +HOMEPAGE = "http://bloodgate.com/perl" +SECTION = "libs" LICENSE = "GPL" DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg" -inherit sdl +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}" + +do_configure () { + if [ -x ${S}/configure ] ; then + cfgcmd="${S}/configure \ + -GL -GLU" + oenote "Running $cfgcmd..." + $cfgcmd || oefatal "oe_runconf failed" + if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then + . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh + sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new + mv Makefile.new Makefile + fi + else + oefatal "no configure script found" + fi +} do_stage () { - install -d ${STAGING_LIBDIR}/perl5/vendor_perl - install -m 0644 ${S}/lib/SDL.pm ${STAGING_LIBDIR}/perl5/vendor_perl + install -d ${STAGING_LIBDIR}/perl5/vendor_perl + install -m 0644 ${S}/lib/SDL.pm ${STAGING_LIBDIR}/perl5/vendor_perl +} + +do_compile () { + oe_runmake PASTHRU_INC="${CFLAGS}" } + +do_install () { + oe_runmake install_vendor +} + +FILES_${PN} += '${libdir}/perl5' |