[oe-commits] org.oe.dev sdl-perl 1.20.3: Fix the build of sdl-perl

[lenehan commit]

sdl-perl 1.20.3: Fix the build of sdl-perl
* Use the cpan class to do all the work instead of manually trying to do
  what cpan.bbclass does.
* Add some sed to stop it searching the system paths for SDL headers and to
  work around it expecting smpeg.h to be in an smpeg subdirectory.
* Update the homepage URL.
NOTE: The source for this version is no longer available, but it is the
version shipped by most distro's. I just grabbed the source from an
"apt-get source sdl-perl".
Fixes #413.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 6eac237f0d909ba98b365d88b337ff3e822907e1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6eac237f0d909ba98b365d88b337ff3e822907e1
Files:
1
packages/sdlperl/sdl-perl_1.20.3.bb
Diffs:

#
# mt diff -r8a4d576b3d74319becbab6ba2aeec2ef416536be -r6eac237f0d909ba98b365d88b337ff3e822907e1
#
# 
# 
# patch "packages/sdlperl/sdl-perl_1.20.3.bb"
#  from [c76d3833b66d9ccaec365dc7add438e341ade908]
#    to [a22ecf86f0c4ee200afea32b60004e1a547ffe37]
# 
============================================================
--- packages/sdlperl/sdl-perl_1.20.3.bb	c76d3833b66d9ccaec365dc7add438e341ade908
+++ packages/sdlperl/sdl-perl_1.20.3.bb	a22ecf86f0c4ee200afea32b60004e1a547ffe37
@@ -1,40 +1,18 @@ DESCRIPTION = "Perl bindings for SDL"
 DESCRIPTION = "Perl bindings for SDL"
-HOMEPAGE = "http://bloodgate.com/perl"
 SECTION = "libs"
+HOMEPAGE = "http://sdl.perl.org/"
 LICENSE = "GPL"
 DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg"
+PR = "r1"
 
-SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz \
-    file://Makefile.patch;patch=1;pnum=0"
+SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz"
 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
-}
+inherit cpan
 
-do_stage () {
-    install -d ${STAGING_LIBDIR}/perl5/vendor_perl
-    install -m 0644 ${S}/lib/SDL.pm ${STAGING_LIBDIR}/perl5/vendor_perl
+do_configure_prepend() {
+        # Search staging area for includes
+        sed -i -e 's:/usr/\(local/\)\{0,1\}include:${STAGING_INCDIR}:g' Makefile.linux
+        # smpeg.h isn't in a subdirectry
+        sed -i -e 's:#include <smpeg/smpeg.h>:#include <smpeg.h>:g' SDL_perl.xs
 }
-
-do_compile () {
-        oe_runmake PASTHRU_INC="${CFLAGS}"
-}
-
-do_install () {
-	oe_runmake install_vendor
-}
-
-FILES_${PN} += '${libdir}/perl5'