From: Philip Balister Date: Wed, 27 Jan 2010 22:55:42 +0000 (-0500) Subject: swig : Fix recipe so it works on target, convert to BBCLASSEXTEND and .inc file. X-Git-Tag: Release-2010-05/1~704 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdfded760fe70a7de824afa012b1fe3b3713a283;p=openembedded.git swig : Fix recipe so it works on target, convert to BBCLASSEXTEND and .inc file. * native packages now use BBCLASSEXTEND method. * Now installs need files into target. * include file to eliminate duplicate portions of the recipe. --- diff --git a/recipes/swig/swig-native_1.3.31.bb b/recipes/swig/swig-native_1.3.31.bb deleted file mode 100644 index 8210bb9cfb..0000000000 --- a/recipes/swig/swig-native_1.3.31.bb +++ /dev/null @@ -1,7 +0,0 @@ -require swig_${PV}.bb -inherit native - -do_stage() { - oe_runmake install PREFIX=${STAGING_BINDIR}/.. -} - diff --git a/recipes/swig/swig-native_1.3.38.bb b/recipes/swig/swig-native_1.3.38.bb deleted file mode 100644 index 8210bb9cfb..0000000000 --- a/recipes/swig/swig-native_1.3.38.bb +++ /dev/null @@ -1,7 +0,0 @@ -require swig_${PV}.bb -inherit native - -do_stage() { - oe_runmake install PREFIX=${STAGING_BINDIR}/.. -} - diff --git a/recipes/swig/swig-native_1.3.39.bb b/recipes/swig/swig-native_1.3.39.bb deleted file mode 100644 index 8210bb9cfb..0000000000 --- a/recipes/swig/swig-native_1.3.39.bb +++ /dev/null @@ -1,7 +0,0 @@ -require swig_${PV}.bb -inherit native - -do_stage() { - oe_runmake install PREFIX=${STAGING_BINDIR}/.. -} - diff --git a/recipes/swig/swig.inc b/recipes/swig/swig.inc new file mode 100644 index 0000000000..30d556c90a --- /dev/null +++ b/recipes/swig/swig.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator" +HOMEPAGE = "http://swig.sourceforge.net/" +LICENSE = "BSD" +SECTION = "devel" +INC_PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" + +inherit autotools + +BBCLASSEXTEND = "native" + +do_configure() { + oe_runconf +} + diff --git a/recipes/swig/swig_1.3.31.bb b/recipes/swig/swig_1.3.31.bb index 8a8138c21c..b245dede4f 100644 --- a/recipes/swig/swig_1.3.31.bb +++ b/recipes/swig/swig_1.3.31.bb @@ -1,16 +1,4 @@ -DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator" -HOMEPAGE = "http://swig.sourceforge.net/" -LICENSE = "BSD" -SECTION = "devel" +require swig.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/swig/swig-${PV}.tar.gz" -S = "${WORKDIR}/swig-${PV}" - -inherit autotools - -EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR_NATIVE}/swig" - -do_configure() { - oe_runconf -} +PR = "${INC_PR}.0" diff --git a/recipes/swig/swig_1.3.38.bb b/recipes/swig/swig_1.3.38.bb index 8a8138c21c..b245dede4f 100644 --- a/recipes/swig/swig_1.3.38.bb +++ b/recipes/swig/swig_1.3.38.bb @@ -1,16 +1,4 @@ -DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator" -HOMEPAGE = "http://swig.sourceforge.net/" -LICENSE = "BSD" -SECTION = "devel" +require swig.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/swig/swig-${PV}.tar.gz" -S = "${WORKDIR}/swig-${PV}" - -inherit autotools - -EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR_NATIVE}/swig" - -do_configure() { - oe_runconf -} +PR = "${INC_PR}.0" diff --git a/recipes/swig/swig_1.3.39.bb b/recipes/swig/swig_1.3.39.bb index 8a8138c21c..02364ceb89 100644 --- a/recipes/swig/swig_1.3.39.bb +++ b/recipes/swig/swig_1.3.39.bb @@ -1,16 +1,5 @@ -DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator" -HOMEPAGE = "http://swig.sourceforge.net/" -LICENSE = "BSD" -SECTION = "devel" +require swig.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/swig/swig-${PV}.tar.gz" -S = "${WORKDIR}/swig-${PV}" - -inherit autotools - -EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR_NATIVE}/swig" - -do_configure() { - oe_runconf -} +PR = "${INC_PR}.0" +DEFAULT_PREFERENCE = "-1"