Patchwork [meta-oe] swig : Update to version 2.0.12 and fix cmake find swig issue.

login
register
mail settings
Submitter Philip Balister
Date March 31, 2014, 11:05 p.m.
Message ID <1396307129-13329-1-git-send-email-philip@balister.org>
Download mbox | patch
Permalink /patch/69769/
State Accepted, archived
Headers show

Comments

Philip Balister - March 31, 2014, 11:05 p.m.
* Dropped PR and PR_INC due to PV change.
 * The cmake rule looks for swig2.0. For the sdk case, the host distro
may have a swig2.0 installed. If so the sdk would find the host swig. This
updates the sdk so it also has a swig2.0 soft linked to the swig binary in
the sdk.

Signed-off-by: Philip Balister <philip@balister.org>
---
 meta-oe/recipes-devtools/swig/swig.inc       | 5 ++++-
 meta-oe/recipes-devtools/swig/swig_2.0.10.bb | 9 ---------
 meta-oe/recipes-devtools/swig/swig_2.0.12.bb | 7 +++++++
 3 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/swig/swig_2.0.10.bb
 create mode 100644 meta-oe/recipes-devtools/swig/swig_2.0.12.bb
Martin Jansa - April 20, 2014, 8:55 a.m.
On Mon, Mar 31, 2014 at 04:05:29PM -0700, Philip Balister wrote:
>  * Dropped PR and PR_INC due to PV change.
>  * The cmake rule looks for swig2.0. For the sdk case, the host distro
> may have a swig2.0 installed. If so the sdk would find the host swig. This
> updates the sdk so it also has a swig2.0 soft linked to the swig binary in
> the sdk.

merged, thanks!

> 
> Signed-off-by: Philip Balister <philip@balister.org>
> ---
>  meta-oe/recipes-devtools/swig/swig.inc       | 5 ++++-
>  meta-oe/recipes-devtools/swig/swig_2.0.10.bb | 9 ---------
>  meta-oe/recipes-devtools/swig/swig_2.0.12.bb | 7 +++++++
>  3 files changed, 11 insertions(+), 10 deletions(-)
>  delete mode 100644 meta-oe/recipes-devtools/swig/swig_2.0.10.bb
>  create mode 100644 meta-oe/recipes-devtools/swig/swig_2.0.12.bb
> 
> diff --git a/meta-oe/recipes-devtools/swig/swig.inc b/meta-oe/recipes-devtools/swig/swig.inc
> index 8e83526..52ef9a6 100644
> --- a/meta-oe/recipes-devtools/swig/swig.inc
> +++ b/meta-oe/recipes-devtools/swig/swig.inc
> @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
>                      file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
>  
>  SECTION = "devel"
> -INC_PR = "r3"
>  
>  DEPENDS = "libpcre python"
>  
> @@ -50,3 +49,7 @@ do_configure() {
>      oe_runconf
>  }
>  
> +do_install_append_class-nativesdk() {
> +    cd ${D}${bindir}
> +    ln -s swig swig2.0
> +}
> diff --git a/meta-oe/recipes-devtools/swig/swig_2.0.10.bb b/meta-oe/recipes-devtools/swig/swig_2.0.10.bb
> deleted file mode 100644
> index 312ce11..0000000
> --- a/meta-oe/recipes-devtools/swig/swig_2.0.10.bb
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -require ${BPN}.inc
> -
> -PR = "${INC_PR}.0"
> -
> -SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch"
> -
> -SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
> -SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
> -
> diff --git a/meta-oe/recipes-devtools/swig/swig_2.0.12.bb b/meta-oe/recipes-devtools/swig/swig_2.0.12.bb
> new file mode 100644
> index 0000000..0fbcfa1
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/swig/swig_2.0.12.bb
> @@ -0,0 +1,7 @@
> +require ${BPN}.inc
> +
> +SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch"
> +
> +SRC_URI[md5sum] = "c3fb0b2d710cc82ed0154b91e43085a4"
> +SRC_URI[sha256sum] = "65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7"
> +
> -- 
> 1.9.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-devtools/swig/swig.inc b/meta-oe/recipes-devtools/swig/swig.inc
index 8e83526..52ef9a6 100644
--- a/meta-oe/recipes-devtools/swig/swig.inc
+++ b/meta-oe/recipes-devtools/swig/swig.inc
@@ -6,7 +6,6 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
                     file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
 
 SECTION = "devel"
-INC_PR = "r3"
 
 DEPENDS = "libpcre python"
 
@@ -50,3 +49,7 @@  do_configure() {
     oe_runconf
 }
 
+do_install_append_class-nativesdk() {
+    cd ${D}${bindir}
+    ln -s swig swig2.0
+}
diff --git a/meta-oe/recipes-devtools/swig/swig_2.0.10.bb b/meta-oe/recipes-devtools/swig/swig_2.0.10.bb
deleted file mode 100644
index 312ce11..0000000
--- a/meta-oe/recipes-devtools/swig/swig_2.0.10.bb
+++ /dev/null
@@ -1,9 +0,0 @@ 
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch"
-
-SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
-SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
-
diff --git a/meta-oe/recipes-devtools/swig/swig_2.0.12.bb b/meta-oe/recipes-devtools/swig/swig_2.0.12.bb
new file mode 100644
index 0000000..0fbcfa1
--- /dev/null
+++ b/meta-oe/recipes-devtools/swig/swig_2.0.12.bb
@@ -0,0 +1,7 @@ 
+require ${BPN}.inc
+
+SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch"
+
+SRC_URI[md5sum] = "c3fb0b2d710cc82ed0154b91e43085a4"
+SRC_URI[sha256sum] = "65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7"
+