Patchwork [meta-oe,v2] swig: avoid host contamination, make build deterministic

login
register
mail settings
Submitter Andreas Oberritter
Date March 6, 2013, 9:25 p.m.
Message ID <1362605111-17641-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/45613/
State Accepted, archived
Headers show

Comments

Andreas Oberritter - March 6, 2013, 9:25 p.m.
* Explicitly disable all other languages than python, which was the
  only language listed in DEPENDS.

* Inherit pythonnative to make it find OE's python executable.

* Depend on libpcre in order to reliably enable Swig's regex feature.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
Sorry, forgot to add [meta-oe] to the Subject line.

 meta-oe/recipes-devtools/swig/swig.inc |   34 +++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)
Martin Jansa - March 13, 2013, 4:36 p.m.
On Wed, Mar 06, 2013 at 10:25:11PM +0100, Andreas Oberritter wrote:
> * Explicitly disable all other languages than python, which was the
>   only language listed in DEPENDS.
> 
> * Inherit pythonnative to make it find OE's python executable.
> 
> * Depend on libpcre in order to reliably enable Swig's regex feature.

Applied, thanks!

> 
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> Sorry, forgot to add [meta-oe] to the Subject line.
> 
>  meta-oe/recipes-devtools/swig/swig.inc |   34 +++++++++++++++++++++++++++-----
>  1 file changed, 29 insertions(+), 5 deletions(-)
> 
> diff --git a/meta-oe/recipes-devtools/swig/swig.inc b/meta-oe/recipes-devtools/swig/swig.inc
> index 97fc5c7..df6f780 100644
> --- a/meta-oe/recipes-devtools/swig/swig.inc
> +++ b/meta-oe/recipes-devtools/swig/swig.inc
> @@ -6,15 +6,39 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
>                      file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
>  
>  SECTION = "devel"
> -INC_PR = "r2"
> +INC_PR = "r3"
>  
> -DEPENDS = "python"
> +DEPENDS = "libpcre python"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
>  
> -inherit autotools
> -
> -EXTRA_OECONF = " --without-guile "
> +inherit autotools pythonnative
> +
> +EXTRA_OECONF = " \
> +	--with-python=${PYTHON} \
> +	--without-allegrocl \
> +	--without-android \
> +	--without-boost \
> +	--without-chicken \
> +	--without-clisp \
> +	--without-csharp \
> +	--without-d \
> +	--without-gcj \
> +	--without-go \
> +	--without-guile \
> +	--without-java \
> +	--without-lua \
> +	--without-mzscheme \
> +	--without-ocaml \
> +	--without-octave \
> +	--without-perl5 \
> +	--without-pike \
> +	--without-php \
> +	--without-python3 \
> +	--without-r \
> +	--without-ruby \
> +	--without-tcl \
> +"
>  
>  BBCLASSEXTEND = "native"
>  
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-devtools/swig/swig.inc b/meta-oe/recipes-devtools/swig/swig.inc
index 97fc5c7..df6f780 100644
--- a/meta-oe/recipes-devtools/swig/swig.inc
+++ b/meta-oe/recipes-devtools/swig/swig.inc
@@ -6,15 +6,39 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
                     file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
 
 SECTION = "devel"
-INC_PR = "r2"
+INC_PR = "r3"
 
-DEPENDS = "python"
+DEPENDS = "libpcre python"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
 
-inherit autotools
-
-EXTRA_OECONF = " --without-guile "
+inherit autotools pythonnative
+
+EXTRA_OECONF = " \
+	--with-python=${PYTHON} \
+	--without-allegrocl \
+	--without-android \
+	--without-boost \
+	--without-chicken \
+	--without-clisp \
+	--without-csharp \
+	--without-d \
+	--without-gcj \
+	--without-go \
+	--without-guile \
+	--without-java \
+	--without-lua \
+	--without-mzscheme \
+	--without-ocaml \
+	--without-octave \
+	--without-perl5 \
+	--without-pike \
+	--without-php \
+	--without-python3 \
+	--without-r \
+	--without-ruby \
+	--without-tcl \
+"
 
 BBCLASSEXTEND = "native"