All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-selinux][PATCH] swig is in meta-oe, remove this copy
@ 2016-02-19 22:59 T.O. Radzy Radzykewycz
  2016-02-22 14:40 ` Mark Hatle
  0 siblings, 1 reply; 12+ messages in thread
From: T.O. Radzy Radzykewycz @ 2016-02-19 22:59 UTC (permalink / raw)
  To: yocto; +Cc: xin.ouyang

A more recent version of swig is in meta-oe, and the local
version does not seem to provide any additional functionality or
security features.  So best to just use the one in meta-oe and
eliminate duplication.

Signed-off-by: T.O. Radzy Radzykewycz <radzy@windriver.com>
---
 recipes-devtools/swig/swig.inc                     | 59 ------------------
 ...lf-exe-for-swig-swiglib-on-non-Win32-plat.patch | 69 ----------------------
 ...nfigure-use-pkg-config-for-pcre-detection.patch | 65 --------------------
 recipes-devtools/swig/swig_2.0.10.bb               | 11 ----
 4 files changed, 204 deletions(-)
 delete mode 100644 recipes-devtools/swig/swig.inc
 delete mode 100644 recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
 delete mode 100644 recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
 delete mode 100644 recipes-devtools/swig/swig_2.0.10.bb

diff --git a/recipes-devtools/swig/swig.inc b/recipes-devtools/swig/swig.inc
deleted file mode 100644
index 74ce5064fe37..000000000000
--- a/recipes-devtools/swig/swig.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
-HOMEPAGE = "http://swig.sourceforge.net/"
-LICENSE = "BSD & GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
-                    file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
-
-SECTION = "devel"
-INC_PR = "r3"
-
-DEPENDS = "libpcre python"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
-
-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 nativesdk"
-
-do_configure() {
-    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
-    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
-    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
-    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
-    oe_runconf
-}
-
-def swiglib_relpath(d):
-    swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
-    return os.path.relpath(swiglib, d.getVar('bindir', True))
-
-do_install_append_class-native() {
-	create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
-}
diff --git a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
deleted file mode 100644
index 81df3e264f52..000000000000
--- a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001
-From: "NODA, Kai" <nodakai@gmail.com>
-Date: Sun, 22 Apr 2012 17:01:02 +0900
-Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
- platforms.
-
-If it wasn't found, then fall back to a fixed string just as before.
-
-Upstream-Status: Submitted
-http://sourceforge.net/mailarchive/message.php?msg_id=29179733
-
----
- Source/Modules/main.cxx |   24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
-index d2f5d3b..cbb0a12 100644
---- a/Source/Modules/main.cxx
-+++ b/Source/Modules/main.cxx
-@@ -26,6 +26,11 @@ char cvsroot_main_cxx[] = "$Id$";
- #include "cparse.h"
- #include <ctype.h>
- #include <limits.h>		// for INT_MAX
-+#ifndef _WIN32
-+#include <cstddef>
-+#include <unistd.h>		// for readlink
-+#include <sys/stat.h>		// for stat
-+#endif
- 
- // Global variables
- 
-@@ -902,9 +907,9 @@ int SWIG_main(int argc, char *argv[], Language *l) {
- 
-   // Check for SWIG_LIB environment variable
-   if ((c = getenv("SWIG_LIB")) == (char *) 0) {
-+    char *p;
- #if defined(_WIN32)
-     char buf[MAX_PATH];
--    char *p;
-     if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
-       *(p + 1) = '\0';
-       SwigLib = NewStringf("%sLib", buf); // Native windows installation path
-@@ -914,7 +919,22 @@ int SWIG_main(int argc, char *argv[], Language *l) {
-     if (Len(SWIG_LIB_WIN_UNIX) > 0)
-       SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
- #else
--    SwigLib = NewString(SWIG_LIB);
-+    char buf[PATH_MAX];
-+    if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) &&
-+        (p = ::strstr(buf, "/bin/swig"))) {
-+        int major, minor, patch;
-+        const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
-+        if (3 == ret) {
-+            const ::ptrdiff_t dir_part_len = p - buf;
-+            ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch);
-+            struct ::stat stat_res;
-+            if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) {
-+                SwigLib = NewString(buf);
-+            }
-+        }
-+    }
-+    if (NULL == SwigLib)
-+        SwigLib = NewString(SWIG_LIB);
- #endif
-   } else {
-     SwigLib = NewString(c);
--- 
-1.7.9.5
-
diff --git a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
deleted file mode 100644
index 5644b1531f19..000000000000
--- a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From cd596816f28407ac403bcb2249f964cefd81f22a Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen.kooi@linaro.org>
-Date: Tue, 17 Jun 2014 08:18:17 +0200
-Subject: [PATCH] configure: use pkg-config for pcre detection
-
-Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-Upstream-Status: pending
----
- configure.ac |   39 +++++++--------------------------------
- 1 file changed, 7 insertions(+), 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c94c2e9..24420c5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,39 +70,14 @@ AC_MSG_RESULT([$with_pcre])
- 
- dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
- if test x"${with_pcre}" = xyes ; then 
--  AC_MSG_CHECKING([whether to use local PCRE])
--  local_pcre_config=no
--  if test -z $PCRE_CONFIG; then
--    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
--      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
--      local_pcre_config=$PCRE_CONFIG
--    fi
--  fi
--  AC_MSG_RESULT([$local_pcre_config])
--fi
--AS_IF([test "x$with_pcre" != xno],
--  [AX_PATH_GENERIC([pcre],
--    [], dnl Minimal version of PCRE we need -- accept any
--    [], dnl custom sed script for version parsing is not needed
--    [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
--     LIBS="$LIBS $PCRE_LIBS"
--     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
--    ],
--    [AC_MSG_FAILURE([
--        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
--        library package. This dependency is needed for configure to complete,
--        Either:
--        - Install the PCRE developer package on your system (preferred approach).
--        - Download the PCRE source tarball, build and install on your system
--          as you would for any package built from source distribution.
--        - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
--          link against. Run 'Tools/pcre-build.sh --help' for instructions.
--          (quite easy and does not require privileges to install PCRE on your system)
--        - Use configure --without-pcre to disable regular expressions support in SWIG
--          (not recommended).])
--    ])
-+  PKG_CHECK_MODULES([PCRE], [libpcre], [
-+    AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
-+    LIBS="$LIBS $PCRE_LIBS"
-+    CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
-+  ], [
-+    AC_MSG_WARN([$PCRE_PKG_ERRORS])
-   ])
--
-+fi
- 
- dnl CCache
- AC_ARG_ENABLE([ccache], AS_HELP_STRING([--disable-ccache], [disable building and installation of ccache-swig executable (default enabled)]), [enable_ccache=$enableval], [enable_ccache=yes])
--- 
-1.7.9.5
-
diff --git a/recipes-devtools/swig/swig_2.0.10.bb b/recipes-devtools/swig/swig_2.0.10.bb
deleted file mode 100644
index 5f1ff5992359..000000000000
--- a/recipes-devtools/swig/swig_2.0.10.bb
+++ /dev/null
@@ -1,11 +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 \
-            file://0001-configure-use-pkg-config-for-pcre-detection.patch \
-           "
-
-SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
-SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
-
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-19 22:59 [meta-selinux][PATCH] swig is in meta-oe, remove this copy T.O. Radzy Radzykewycz
@ 2016-02-22 14:40 ` Mark Hatle
  2016-02-22 14:51   ` Radzykewycz, T (Radzy)
  2016-02-22 15:33   ` Joe MacDonald
  0 siblings, 2 replies; 12+ messages in thread
From: Mark Hatle @ 2016-02-22 14:40 UTC (permalink / raw)
  To: T.O. Radzy Radzykewycz, yocto

On 2/19/16 4:59 PM, T.O. Radzy Radzykewycz wrote:
> A more recent version of swig is in meta-oe, and the local
> version does not seem to provide any additional functionality or
> security features.  So best to just use the one in meta-oe and
> eliminate duplication.
> 
> Signed-off-by: T.O. Radzy Radzykewycz <radzy@windriver.com>

In the past we carried our own version of swig to break any dependency on meta-oe.

I'm not sure if we want to keep doing that or not -- but if we do keep our own
version, we need to make sure it stays in sync w/ meta-oe (and the needs of the
selinux components).

Joe/Philip, any comments?

(I'm not against removing the local copy, but I want to make sure it makes sense
first.)

--Mark

> ---
>  recipes-devtools/swig/swig.inc                     | 59 ------------------
>  ...lf-exe-for-swig-swiglib-on-non-Win32-plat.patch | 69 ----------------------
>  ...nfigure-use-pkg-config-for-pcre-detection.patch | 65 --------------------
>  recipes-devtools/swig/swig_2.0.10.bb               | 11 ----
>  4 files changed, 204 deletions(-)
>  delete mode 100644 recipes-devtools/swig/swig.inc
>  delete mode 100644 recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
>  delete mode 100644 recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
>  delete mode 100644 recipes-devtools/swig/swig_2.0.10.bb
> 
> diff --git a/recipes-devtools/swig/swig.inc b/recipes-devtools/swig/swig.inc
> deleted file mode 100644
> index 74ce5064fe37..000000000000
> --- a/recipes-devtools/swig/swig.inc
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
> -HOMEPAGE = "http://swig.sourceforge.net/"
> -LICENSE = "BSD & GPLv3"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
> -                    file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
> -                    file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
> -
> -SECTION = "devel"
> -INC_PR = "r3"
> -
> -DEPENDS = "libpcre python"
> -
> -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
> -
> -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 nativesdk"
> -
> -do_configure() {
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
> -    oe_runconf
> -}
> -
> -def swiglib_relpath(d):
> -    swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
> -    return os.path.relpath(swiglib, d.getVar('bindir', True))
> -
> -do_install_append_class-native() {
> -	create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
> -}
> diff --git a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> deleted file mode 100644
> index 81df3e264f52..000000000000
> --- a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001
> -From: "NODA, Kai" <nodakai@gmail.com>
> -Date: Sun, 22 Apr 2012 17:01:02 +0900
> -Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
> - platforms.
> -
> -If it wasn't found, then fall back to a fixed string just as before.
> -
> -Upstream-Status: Submitted
> -http://sourceforge.net/mailarchive/message.php?msg_id=29179733
> -
> ----
> - Source/Modules/main.cxx |   24 ++++++++++++++++++++++--
> - 1 file changed, 22 insertions(+), 2 deletions(-)
> -
> -diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
> -index d2f5d3b..cbb0a12 100644
> ---- a/Source/Modules/main.cxx
> -+++ b/Source/Modules/main.cxx
> -@@ -26,6 +26,11 @@ char cvsroot_main_cxx[] = "$Id$";
> - #include "cparse.h"
> - #include <ctype.h>
> - #include <limits.h>		// for INT_MAX
> -+#ifndef _WIN32
> -+#include <cstddef>
> -+#include <unistd.h>		// for readlink
> -+#include <sys/stat.h>		// for stat
> -+#endif
> - 
> - // Global variables
> - 
> -@@ -902,9 +907,9 @@ int SWIG_main(int argc, char *argv[], Language *l) {
> - 
> -   // Check for SWIG_LIB environment variable
> -   if ((c = getenv("SWIG_LIB")) == (char *) 0) {
> -+    char *p;
> - #if defined(_WIN32)
> -     char buf[MAX_PATH];
> --    char *p;
> -     if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
> -       *(p + 1) = '\0';
> -       SwigLib = NewStringf("%sLib", buf); // Native windows installation path
> -@@ -914,7 +919,22 @@ int SWIG_main(int argc, char *argv[], Language *l) {
> -     if (Len(SWIG_LIB_WIN_UNIX) > 0)
> -       SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
> - #else
> --    SwigLib = NewString(SWIG_LIB);
> -+    char buf[PATH_MAX];
> -+    if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) &&
> -+        (p = ::strstr(buf, "/bin/swig"))) {
> -+        int major, minor, patch;
> -+        const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
> -+        if (3 == ret) {
> -+            const ::ptrdiff_t dir_part_len = p - buf;
> -+            ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch);
> -+            struct ::stat stat_res;
> -+            if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) {
> -+                SwigLib = NewString(buf);
> -+            }
> -+        }
> -+    }
> -+    if (NULL == SwigLib)
> -+        SwigLib = NewString(SWIG_LIB);
> - #endif
> -   } else {
> -     SwigLib = NewString(c);
> --- 
> -1.7.9.5
> -
> diff --git a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> deleted file mode 100644
> index 5644b1531f19..000000000000
> --- a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -From cd596816f28407ac403bcb2249f964cefd81f22a Mon Sep 17 00:00:00 2001
> -From: Koen Kooi <koen.kooi@linaro.org>
> -Date: Tue, 17 Jun 2014 08:18:17 +0200
> -Subject: [PATCH] configure: use pkg-config for pcre detection
> -
> -Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> -Upstream-Status: pending
> ----
> - configure.ac |   39 +++++++--------------------------------
> - 1 file changed, 7 insertions(+), 32 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index c94c2e9..24420c5 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -70,39 +70,14 @@ AC_MSG_RESULT([$with_pcre])
> - 
> - dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
> - if test x"${with_pcre}" = xyes ; then 
> --  AC_MSG_CHECKING([whether to use local PCRE])
> --  local_pcre_config=no
> --  if test -z $PCRE_CONFIG; then
> --    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
> --      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
> --      local_pcre_config=$PCRE_CONFIG
> --    fi
> --  fi
> --  AC_MSG_RESULT([$local_pcre_config])
> --fi
> --AS_IF([test "x$with_pcre" != xno],
> --  [AX_PATH_GENERIC([pcre],
> --    [], dnl Minimal version of PCRE we need -- accept any
> --    [], dnl custom sed script for version parsing is not needed
> --    [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
> --     LIBS="$LIBS $PCRE_LIBS"
> --     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
> --    ],
> --    [AC_MSG_FAILURE([
> --        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
> --        library package. This dependency is needed for configure to complete,
> --        Either:
> --        - Install the PCRE developer package on your system (preferred approach).
> --        - Download the PCRE source tarball, build and install on your system
> --          as you would for any package built from source distribution.
> --        - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
> --          link against. Run 'Tools/pcre-build.sh --help' for instructions.
> --          (quite easy and does not require privileges to install PCRE on your system)
> --        - Use configure --without-pcre to disable regular expressions support in SWIG
> --          (not recommended).])
> --    ])
> -+  PKG_CHECK_MODULES([PCRE], [libpcre], [
> -+    AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
> -+    LIBS="$LIBS $PCRE_LIBS"
> -+    CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
> -+  ], [
> -+    AC_MSG_WARN([$PCRE_PKG_ERRORS])
> -   ])
> --
> -+fi
> - 
> - dnl CCache
> - AC_ARG_ENABLE([ccache], AS_HELP_STRING([--disable-ccache], [disable building and installation of ccache-swig executable (default enabled)]), [enable_ccache=$enableval], [enable_ccache=yes])
> --- 
> -1.7.9.5
> -
> diff --git a/recipes-devtools/swig/swig_2.0.10.bb b/recipes-devtools/swig/swig_2.0.10.bb
> deleted file mode 100644
> index 5f1ff5992359..000000000000
> --- a/recipes-devtools/swig/swig_2.0.10.bb
> +++ /dev/null
> @@ -1,11 +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 \
> -            file://0001-configure-use-pkg-config-for-pcre-detection.patch \
> -           "
> -
> -SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
> -SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
> -
> 



^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-22 14:40 ` Mark Hatle
@ 2016-02-22 14:51   ` Radzykewycz, T (Radzy)
  2016-02-24 17:10     ` Burton, Ross
  2016-02-22 15:33   ` Joe MacDonald
  1 sibling, 1 reply; 12+ messages in thread
From: Radzykewycz, T (Radzy) @ 2016-02-22 14:51 UTC (permalink / raw)
  To: Hatle, Mark, yocto@yoctoproject.org

It's easy enough to update the one in meta-selinux, if the decision is
to keep the duplicate.  I have a 3.0.6 => 3.0.8 update ready to upload
to meta-oe, and I can do meta-selinux at the same time.


________________________________________
From: Mark Hatle [mark.hatle@windriver.com]
Sent: Monday, February 22, 2016 6:40 AM
To: Radzykewycz, T (Radzy); yocto@yoctoproject.org
Cc: joe_macdonald@mentor.com; Philip Tricca
Subject: Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy

On 2/19/16 4:59 PM, T.O. Radzy Radzykewycz wrote:
> A more recent version of swig is in meta-oe, and the local
> version does not seem to provide any additional functionality or
> security features.  So best to just use the one in meta-oe and
> eliminate duplication.
>
> Signed-off-by: T.O. Radzy Radzykewycz <radzy@windriver.com>

In the past we carried our own version of swig to break any dependency on meta-oe.

I'm not sure if we want to keep doing that or not -- but if we do keep our own
version, we need to make sure it stays in sync w/ meta-oe (and the needs of the
selinux components).

Joe/Philip, any comments?

(I'm not against removing the local copy, but I want to make sure it makes sense
first.)

--Mark

> ---
>  recipes-devtools/swig/swig.inc                     | 59 ------------------
>  ...lf-exe-for-swig-swiglib-on-non-Win32-plat.patch | 69 ----------------------
>  ...nfigure-use-pkg-config-for-pcre-detection.patch | 65 --------------------
>  recipes-devtools/swig/swig_2.0.10.bb               | 11 ----
>  4 files changed, 204 deletions(-)
>  delete mode 100644 recipes-devtools/swig/swig.inc
>  delete mode 100644 recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
>  delete mode 100644 recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
>  delete mode 100644 recipes-devtools/swig/swig_2.0.10.bb
>
> diff --git a/recipes-devtools/swig/swig.inc b/recipes-devtools/swig/swig.inc
> deleted file mode 100644
> index 74ce5064fe37..000000000000
> --- a/recipes-devtools/swig/swig.inc
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
> -HOMEPAGE = "http://swig.sourceforge.net/"
> -LICENSE = "BSD & GPLv3"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
> -                    file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
> -                    file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
> -
> -SECTION = "devel"
> -INC_PR = "r3"
> -
> -DEPENDS = "libpcre python"
> -
> -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
> -
> -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 nativesdk"
> -
> -do_configure() {
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
> -    oe_runconf
> -}
> -
> -def swiglib_relpath(d):
> -    swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
> -    return os.path.relpath(swiglib, d.getVar('bindir', True))
> -
> -do_install_append_class-native() {
> -     create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
> -}
> diff --git a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> deleted file mode 100644
> index 81df3e264f52..000000000000
> --- a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001
> -From: "NODA, Kai" <nodakai@gmail.com>
> -Date: Sun, 22 Apr 2012 17:01:02 +0900
> -Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
> - platforms.
> -
> -If it wasn't found, then fall back to a fixed string just as before.
> -
> -Upstream-Status: Submitted
> -http://sourceforge.net/mailarchive/message.php?msg_id=29179733
> -
> ----
> - Source/Modules/main.cxx |   24 ++++++++++++++++++++++--
> - 1 file changed, 22 insertions(+), 2 deletions(-)
> -
> -diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
> -index d2f5d3b..cbb0a12 100644
> ---- a/Source/Modules/main.cxx
> -+++ b/Source/Modules/main.cxx
> -@@ -26,6 +26,11 @@ char cvsroot_main_cxx[] = "$Id$";
> - #include "cparse.h"
> - #include <ctype.h>
> - #include <limits.h>         // for INT_MAX
> -+#ifndef _WIN32
> -+#include <cstddef>
> -+#include <unistd.h>         // for readlink
> -+#include <sys/stat.h>               // for stat
> -+#endif
> -
> - // Global variables
> -
> -@@ -902,9 +907,9 @@ int SWIG_main(int argc, char *argv[], Language *l) {
> -
> -   // Check for SWIG_LIB environment variable
> -   if ((c = getenv("SWIG_LIB")) == (char *) 0) {
> -+    char *p;
> - #if defined(_WIN32)
> -     char buf[MAX_PATH];
> --    char *p;
> -     if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
> -       *(p + 1) = '\0';
> -       SwigLib = NewStringf("%sLib", buf); // Native windows installation path
> -@@ -914,7 +919,22 @@ int SWIG_main(int argc, char *argv[], Language *l) {
> -     if (Len(SWIG_LIB_WIN_UNIX) > 0)
> -       SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
> - #else
> --    SwigLib = NewString(SWIG_LIB);
> -+    char buf[PATH_MAX];
> -+    if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) &&
> -+        (p = ::strstr(buf, "/bin/swig"))) {
> -+        int major, minor, patch;
> -+        const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
> -+        if (3 == ret) {
> -+            const ::ptrdiff_t dir_part_len = p - buf;
> -+            ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch);
> -+            struct ::stat stat_res;
> -+            if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) {
> -+                SwigLib = NewString(buf);
> -+            }
> -+        }
> -+    }
> -+    if (NULL == SwigLib)
> -+        SwigLib = NewString(SWIG_LIB);
> - #endif
> -   } else {
> -     SwigLib = NewString(c);
> ---
> -1.7.9.5
> -
> diff --git a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> deleted file mode 100644
> index 5644b1531f19..000000000000
> --- a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -From cd596816f28407ac403bcb2249f964cefd81f22a Mon Sep 17 00:00:00 2001
> -From: Koen Kooi <koen.kooi@linaro.org>
> -Date: Tue, 17 Jun 2014 08:18:17 +0200
> -Subject: [PATCH] configure: use pkg-config for pcre detection
> -
> -Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> -Upstream-Status: pending
> ----
> - configure.ac |   39 +++++++--------------------------------
> - 1 file changed, 7 insertions(+), 32 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index c94c2e9..24420c5 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -70,39 +70,14 @@ AC_MSG_RESULT([$with_pcre])
> -
> - dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
> - if test x"${with_pcre}" = xyes ; then
> --  AC_MSG_CHECKING([whether to use local PCRE])
> --  local_pcre_config=no
> --  if test -z $PCRE_CONFIG; then
> --    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
> --      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
> --      local_pcre_config=$PCRE_CONFIG
> --    fi
> --  fi
> --  AC_MSG_RESULT([$local_pcre_config])
> --fi
> --AS_IF([test "x$with_pcre" != xno],
> --  [AX_PATH_GENERIC([pcre],
> --    [], dnl Minimal version of PCRE we need -- accept any
> --    [], dnl custom sed script for version parsing is not needed
> --    [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
> --     LIBS="$LIBS $PCRE_LIBS"
> --     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
> --    ],
> --    [AC_MSG_FAILURE([
> --        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
> --        library package. This dependency is needed for configure to complete,
> --        Either:
> --        - Install the PCRE developer package on your system (preferred approach).
> --        - Download the PCRE source tarball, build and install on your system
> --          as you would for any package built from source distribution.
> --        - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
> --          link against. Run 'Tools/pcre-build.sh --help' for instructions.
> --          (quite easy and does not require privileges to install PCRE on your system)
> --        - Use configure --without-pcre to disable regular expressions support in SWIG
> --          (not recommended).])
> --    ])
> -+  PKG_CHECK_MODULES([PCRE], [libpcre], [
> -+    AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
> -+    LIBS="$LIBS $PCRE_LIBS"
> -+    CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
> -+  ], [
> -+    AC_MSG_WARN([$PCRE_PKG_ERRORS])
> -   ])
> --
> -+fi
> -
> - dnl CCache
> - AC_ARG_ENABLE([ccache], AS_HELP_STRING([--disable-ccache], [disable building and installation of ccache-swig executable (default enabled)]), [enable_ccache=$enableval], [enable_ccache=yes])
> ---
> -1.7.9.5
> -
> diff --git a/recipes-devtools/swig/swig_2.0.10.bb b/recipes-devtools/swig/swig_2.0.10.bb
> deleted file mode 100644
> index 5f1ff5992359..000000000000
> --- a/recipes-devtools/swig/swig_2.0.10.bb
> +++ /dev/null
> @@ -1,11 +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 \
> -            file://0001-configure-use-pkg-config-for-pcre-detection.patch \
> -           "
> -
> -SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
> -SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
> -
>



^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-22 14:40 ` Mark Hatle
  2016-02-22 14:51   ` Radzykewycz, T (Radzy)
@ 2016-02-22 15:33   ` Joe MacDonald
  2016-02-22 15:57     ` Philip Balister
  2016-02-22 15:58     ` Burton, Ross
  1 sibling, 2 replies; 12+ messages in thread
From: Joe MacDonald @ 2016-02-22 15:33 UTC (permalink / raw)
  To: Mark Hatle; +Cc: T.O. Radzy Radzykewycz, yocto

[-- Attachment #1: Type: text/plain, Size: 11548 bytes --]

[Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy] On 16.02.22 (Mon 08:40) Mark Hatle wrote:

> On 2/19/16 4:59 PM, T.O. Radzy Radzykewycz wrote:
> > A more recent version of swig is in meta-oe, and the local
> > version does not seem to provide any additional functionality or
> > security features.  So best to just use the one in meta-oe and
> > eliminate duplication.
> > 
> > Signed-off-by: T.O. Radzy Radzykewycz <radzy@windriver.com>
> 
> In the past we carried our own version of swig to break any dependency on meta-oe.
> 
> I'm not sure if we want to keep doing that or not -- but if we do keep our own
> version, we need to make sure it stays in sync w/ meta-oe (and the needs of the
> selinux components).
> 
> Joe/Philip, any comments?
> 
> (I'm not against removing the local copy, but I want to make sure it makes sense
> first.)

I'm also not against removing the local copy (I don't think it adds
anything to the layer and occasionally causes headaches), but I really
don't want to make meta-selinux dependent on meta-oe components, so I
guess I'm voting for keeping it.

-J.

> 
> --Mark
> 
> > ---
> >  recipes-devtools/swig/swig.inc                     | 59 ------------------
> >  ...lf-exe-for-swig-swiglib-on-non-Win32-plat.patch | 69 ----------------------
> >  ...nfigure-use-pkg-config-for-pcre-detection.patch | 65 --------------------
> >  recipes-devtools/swig/swig_2.0.10.bb               | 11 ----
> >  4 files changed, 204 deletions(-)
> >  delete mode 100644 recipes-devtools/swig/swig.inc
> >  delete mode 100644 recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> >  delete mode 100644 recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> >  delete mode 100644 recipes-devtools/swig/swig_2.0.10.bb
> > 
> > diff --git a/recipes-devtools/swig/swig.inc b/recipes-devtools/swig/swig.inc
> > deleted file mode 100644
> > index 74ce5064fe37..000000000000
> > --- a/recipes-devtools/swig/swig.inc
> > +++ /dev/null
> > @@ -1,59 +0,0 @@
> > -DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
> > -HOMEPAGE = "http://swig.sourceforge.net/"
> > -LICENSE = "BSD & GPLv3"
> > -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
> > -                    file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
> > -                    file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
> > -
> > -SECTION = "devel"
> > -INC_PR = "r3"
> > -
> > -DEPENDS = "libpcre python"
> > -
> > -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
> > -
> > -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 nativesdk"
> > -
> > -do_configure() {
> > -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
> > -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
> > -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
> > -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
> > -    oe_runconf
> > -}
> > -
> > -def swiglib_relpath(d):
> > -    swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
> > -    return os.path.relpath(swiglib, d.getVar('bindir', True))
> > -
> > -do_install_append_class-native() {
> > -	create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
> > -}
> > diff --git a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> > deleted file mode 100644
> > index 81df3e264f52..000000000000
> > --- a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> > +++ /dev/null
> > @@ -1,69 +0,0 @@
> > -From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001
> > -From: "NODA, Kai" <nodakai@gmail.com>
> > -Date: Sun, 22 Apr 2012 17:01:02 +0900
> > -Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
> > - platforms.
> > -
> > -If it wasn't found, then fall back to a fixed string just as before.
> > -
> > -Upstream-Status: Submitted
> > -http://sourceforge.net/mailarchive/message.php?msg_id=29179733
> > -
> > ----
> > - Source/Modules/main.cxx |   24 ++++++++++++++++++++++--
> > - 1 file changed, 22 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
> > -index d2f5d3b..cbb0a12 100644
> > ---- a/Source/Modules/main.cxx
> > -+++ b/Source/Modules/main.cxx
> > -@@ -26,6 +26,11 @@ char cvsroot_main_cxx[] = "$Id$";
> > - #include "cparse.h"
> > - #include <ctype.h>
> > - #include <limits.h>		// for INT_MAX
> > -+#ifndef _WIN32
> > -+#include <cstddef>
> > -+#include <unistd.h>		// for readlink
> > -+#include <sys/stat.h>		// for stat
> > -+#endif
> > - 
> > - // Global variables
> > - 
> > -@@ -902,9 +907,9 @@ int SWIG_main(int argc, char *argv[], Language *l) {
> > - 
> > -   // Check for SWIG_LIB environment variable
> > -   if ((c = getenv("SWIG_LIB")) == (char *) 0) {
> > -+    char *p;
> > - #if defined(_WIN32)
> > -     char buf[MAX_PATH];
> > --    char *p;
> > -     if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
> > -       *(p + 1) = '\0';
> > -       SwigLib = NewStringf("%sLib", buf); // Native windows installation path
> > -@@ -914,7 +919,22 @@ int SWIG_main(int argc, char *argv[], Language *l) {
> > -     if (Len(SWIG_LIB_WIN_UNIX) > 0)
> > -       SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
> > - #else
> > --    SwigLib = NewString(SWIG_LIB);
> > -+    char buf[PATH_MAX];
> > -+    if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) &&
> > -+        (p = ::strstr(buf, "/bin/swig"))) {
> > -+        int major, minor, patch;
> > -+        const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
> > -+        if (3 == ret) {
> > -+            const ::ptrdiff_t dir_part_len = p - buf;
> > -+            ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch);
> > -+            struct ::stat stat_res;
> > -+            if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) {
> > -+                SwigLib = NewString(buf);
> > -+            }
> > -+        }
> > -+    }
> > -+    if (NULL == SwigLib)
> > -+        SwigLib = NewString(SWIG_LIB);
> > - #endif
> > -   } else {
> > -     SwigLib = NewString(c);
> > --- 
> > -1.7.9.5
> > -
> > diff --git a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> > deleted file mode 100644
> > index 5644b1531f19..000000000000
> > --- a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
> > +++ /dev/null
> > @@ -1,65 +0,0 @@
> > -From cd596816f28407ac403bcb2249f964cefd81f22a Mon Sep 17 00:00:00 2001
> > -From: Koen Kooi <koen.kooi@linaro.org>
> > -Date: Tue, 17 Jun 2014 08:18:17 +0200
> > -Subject: [PATCH] configure: use pkg-config for pcre detection
> > -
> > -Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> > -Upstream-Status: pending
> > ----
> > - configure.ac |   39 +++++++--------------------------------
> > - 1 file changed, 7 insertions(+), 32 deletions(-)
> > -
> > -diff --git a/configure.ac b/configure.ac
> > -index c94c2e9..24420c5 100644
> > ---- a/configure.ac
> > -+++ b/configure.ac
> > -@@ -70,39 +70,14 @@ AC_MSG_RESULT([$with_pcre])
> > - 
> > - dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
> > - if test x"${with_pcre}" = xyes ; then 
> > --  AC_MSG_CHECKING([whether to use local PCRE])
> > --  local_pcre_config=no
> > --  if test -z $PCRE_CONFIG; then
> > --    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
> > --      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
> > --      local_pcre_config=$PCRE_CONFIG
> > --    fi
> > --  fi
> > --  AC_MSG_RESULT([$local_pcre_config])
> > --fi
> > --AS_IF([test "x$with_pcre" != xno],
> > --  [AX_PATH_GENERIC([pcre],
> > --    [], dnl Minimal version of PCRE we need -- accept any
> > --    [], dnl custom sed script for version parsing is not needed
> > --    [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
> > --     LIBS="$LIBS $PCRE_LIBS"
> > --     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
> > --    ],
> > --    [AC_MSG_FAILURE([
> > --        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
> > --        library package. This dependency is needed for configure to complete,
> > --        Either:
> > --        - Install the PCRE developer package on your system (preferred approach).
> > --        - Download the PCRE source tarball, build and install on your system
> > --          as you would for any package built from source distribution.
> > --        - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
> > --          link against. Run 'Tools/pcre-build.sh --help' for instructions.
> > --          (quite easy and does not require privileges to install PCRE on your system)
> > --        - Use configure --without-pcre to disable regular expressions support in SWIG
> > --          (not recommended).])
> > --    ])
> > -+  PKG_CHECK_MODULES([PCRE], [libpcre], [
> > -+    AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
> > -+    LIBS="$LIBS $PCRE_LIBS"
> > -+    CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
> > -+  ], [
> > -+    AC_MSG_WARN([$PCRE_PKG_ERRORS])
> > -   ])
> > --
> > -+fi
> > - 
> > - dnl CCache
> > - AC_ARG_ENABLE([ccache], AS_HELP_STRING([--disable-ccache], [disable building and installation of ccache-swig executable (default enabled)]), [enable_ccache=$enableval], [enable_ccache=yes])
> > --- 
> > -1.7.9.5
> > -
> > diff --git a/recipes-devtools/swig/swig_2.0.10.bb b/recipes-devtools/swig/swig_2.0.10.bb
> > deleted file mode 100644
> > index 5f1ff5992359..000000000000
> > --- a/recipes-devtools/swig/swig_2.0.10.bb
> > +++ /dev/null
> > @@ -1,11 +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 \
> > -            file://0001-configure-use-pkg-config-for-pcre-detection.patch \
> > -           "
> > -
> > -SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
> > -SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
> > -
> > 
> 

-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-22 15:33   ` Joe MacDonald
@ 2016-02-22 15:57     ` Philip Balister
  2016-02-22 15:58     ` Burton, Ross
  1 sibling, 0 replies; 12+ messages in thread
From: Philip Balister @ 2016-02-22 15:57 UTC (permalink / raw)
  To: Joe MacDonald, Mark Hatle; +Cc: T.O. Radzy Radzykewycz, yocto

[-- Attachment #1: Type: text/plain, Size: 11880 bytes --]

On 02/22/2016 10:33 AM, Joe MacDonald wrote:
> [Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy] On 16.02.22 (Mon 08:40) Mark Hatle wrote:
> 
>> On 2/19/16 4:59 PM, T.O. Radzy Radzykewycz wrote:
>>> A more recent version of swig is in meta-oe, and the local
>>> version does not seem to provide any additional functionality or
>>> security features.  So best to just use the one in meta-oe and
>>> eliminate duplication.
>>>
>>> Signed-off-by: T.O. Radzy Radzykewycz <radzy@windriver.com>
>>
>> In the past we carried our own version of swig to break any dependency on meta-oe.
>>
>> I'm not sure if we want to keep doing that or not -- but if we do keep our own
>> version, we need to make sure it stays in sync w/ meta-oe (and the needs of the
>> selinux components).
>>
>> Joe/Philip, any comments?
>>
>> (I'm not against removing the local copy, but I want to make sure it makes sense
>> first.)
> 
> I'm also not against removing the local copy (I don't think it adds
> anything to the layer and occasionally causes headaches), but I really
> don't want to make meta-selinux dependent on meta-oe components, so I
> guess I'm voting for keeping it.

Should we talk about moving swig to oe-core then? GNURadio uses it in
meta-sdr, meta-selinux uses it, and several recipes in meta-oe do. If
layers are using a component from meta-oe, it is time to talk about
moving the recipe to oe-core.

Philip, the original one.

> 
> -J.
> 
>>
>> --Mark
>>
>>> ---
>>>  recipes-devtools/swig/swig.inc                     | 59 ------------------
>>>  ...lf-exe-for-swig-swiglib-on-non-Win32-plat.patch | 69 ----------------------
>>>  ...nfigure-use-pkg-config-for-pcre-detection.patch | 65 --------------------
>>>  recipes-devtools/swig/swig_2.0.10.bb               | 11 ----
>>>  4 files changed, 204 deletions(-)
>>>  delete mode 100644 recipes-devtools/swig/swig.inc
>>>  delete mode 100644 recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
>>>  delete mode 100644 recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
>>>  delete mode 100644 recipes-devtools/swig/swig_2.0.10.bb
>>>
>>> diff --git a/recipes-devtools/swig/swig.inc b/recipes-devtools/swig/swig.inc
>>> deleted file mode 100644
>>> index 74ce5064fe37..000000000000
>>> --- a/recipes-devtools/swig/swig.inc
>>> +++ /dev/null
>>> @@ -1,59 +0,0 @@
>>> -DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
>>> -HOMEPAGE = "http://swig.sourceforge.net/"
>>> -LICENSE = "BSD & GPLv3"
>>> -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
>>> -                    file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
>>> -                    file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
>>> -
>>> -SECTION = "devel"
>>> -INC_PR = "r3"
>>> -
>>> -DEPENDS = "libpcre python"
>>> -
>>> -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
>>> -
>>> -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 nativesdk"
>>> -
>>> -do_configure() {
>>> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
>>> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
>>> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
>>> -    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
>>> -    oe_runconf
>>> -}
>>> -
>>> -def swiglib_relpath(d):
>>> -    swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
>>> -    return os.path.relpath(swiglib, d.getVar('bindir', True))
>>> -
>>> -do_install_append_class-native() {
>>> -	create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
>>> -}
>>> diff --git a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
>>> deleted file mode 100644
>>> index 81df3e264f52..000000000000
>>> --- a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
>>> +++ /dev/null
>>> @@ -1,69 +0,0 @@
>>> -From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001
>>> -From: "NODA, Kai" <nodakai@gmail.com>
>>> -Date: Sun, 22 Apr 2012 17:01:02 +0900
>>> -Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
>>> - platforms.
>>> -
>>> -If it wasn't found, then fall back to a fixed string just as before.
>>> -
>>> -Upstream-Status: Submitted
>>> -http://sourceforge.net/mailarchive/message.php?msg_id=29179733
>>> -
>>> ----
>>> - Source/Modules/main.cxx |   24 ++++++++++++++++++++++--
>>> - 1 file changed, 22 insertions(+), 2 deletions(-)
>>> -
>>> -diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
>>> -index d2f5d3b..cbb0a12 100644
>>> ---- a/Source/Modules/main.cxx
>>> -+++ b/Source/Modules/main.cxx
>>> -@@ -26,6 +26,11 @@ char cvsroot_main_cxx[] = "$Id$";
>>> - #include "cparse.h"
>>> - #include <ctype.h>
>>> - #include <limits.h>		// for INT_MAX
>>> -+#ifndef _WIN32
>>> -+#include <cstddef>
>>> -+#include <unistd.h>		// for readlink
>>> -+#include <sys/stat.h>		// for stat
>>> -+#endif
>>> - 
>>> - // Global variables
>>> - 
>>> -@@ -902,9 +907,9 @@ int SWIG_main(int argc, char *argv[], Language *l) {
>>> - 
>>> -   // Check for SWIG_LIB environment variable
>>> -   if ((c = getenv("SWIG_LIB")) == (char *) 0) {
>>> -+    char *p;
>>> - #if defined(_WIN32)
>>> -     char buf[MAX_PATH];
>>> --    char *p;
>>> -     if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
>>> -       *(p + 1) = '\0';
>>> -       SwigLib = NewStringf("%sLib", buf); // Native windows installation path
>>> -@@ -914,7 +919,22 @@ int SWIG_main(int argc, char *argv[], Language *l) {
>>> -     if (Len(SWIG_LIB_WIN_UNIX) > 0)
>>> -       SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
>>> - #else
>>> --    SwigLib = NewString(SWIG_LIB);
>>> -+    char buf[PATH_MAX];
>>> -+    if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) &&
>>> -+        (p = ::strstr(buf, "/bin/swig"))) {
>>> -+        int major, minor, patch;
>>> -+        const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
>>> -+        if (3 == ret) {
>>> -+            const ::ptrdiff_t dir_part_len = p - buf;
>>> -+            ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch);
>>> -+            struct ::stat stat_res;
>>> -+            if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) {
>>> -+                SwigLib = NewString(buf);
>>> -+            }
>>> -+        }
>>> -+    }
>>> -+    if (NULL == SwigLib)
>>> -+        SwigLib = NewString(SWIG_LIB);
>>> - #endif
>>> -   } else {
>>> -     SwigLib = NewString(c);
>>> --- 
>>> -1.7.9.5
>>> -
>>> diff --git a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
>>> deleted file mode 100644
>>> index 5644b1531f19..000000000000
>>> --- a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
>>> +++ /dev/null
>>> @@ -1,65 +0,0 @@
>>> -From cd596816f28407ac403bcb2249f964cefd81f22a Mon Sep 17 00:00:00 2001
>>> -From: Koen Kooi <koen.kooi@linaro.org>
>>> -Date: Tue, 17 Jun 2014 08:18:17 +0200
>>> -Subject: [PATCH] configure: use pkg-config for pcre detection
>>> -
>>> -Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
>>> -Upstream-Status: pending
>>> ----
>>> - configure.ac |   39 +++++++--------------------------------
>>> - 1 file changed, 7 insertions(+), 32 deletions(-)
>>> -
>>> -diff --git a/configure.ac b/configure.ac
>>> -index c94c2e9..24420c5 100644
>>> ---- a/configure.ac
>>> -+++ b/configure.ac
>>> -@@ -70,39 +70,14 @@ AC_MSG_RESULT([$with_pcre])
>>> - 
>>> - dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
>>> - if test x"${with_pcre}" = xyes ; then 
>>> --  AC_MSG_CHECKING([whether to use local PCRE])
>>> --  local_pcre_config=no
>>> --  if test -z $PCRE_CONFIG; then
>>> --    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
>>> --      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
>>> --      local_pcre_config=$PCRE_CONFIG
>>> --    fi
>>> --  fi
>>> --  AC_MSG_RESULT([$local_pcre_config])
>>> --fi
>>> --AS_IF([test "x$with_pcre" != xno],
>>> --  [AX_PATH_GENERIC([pcre],
>>> --    [], dnl Minimal version of PCRE we need -- accept any
>>> --    [], dnl custom sed script for version parsing is not needed
>>> --    [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
>>> --     LIBS="$LIBS $PCRE_LIBS"
>>> --     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
>>> --    ],
>>> --    [AC_MSG_FAILURE([
>>> --        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
>>> --        library package. This dependency is needed for configure to complete,
>>> --        Either:
>>> --        - Install the PCRE developer package on your system (preferred approach).
>>> --        - Download the PCRE source tarball, build and install on your system
>>> --          as you would for any package built from source distribution.
>>> --        - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
>>> --          link against. Run 'Tools/pcre-build.sh --help' for instructions.
>>> --          (quite easy and does not require privileges to install PCRE on your system)
>>> --        - Use configure --without-pcre to disable regular expressions support in SWIG
>>> --          (not recommended).])
>>> --    ])
>>> -+  PKG_CHECK_MODULES([PCRE], [libpcre], [
>>> -+    AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
>>> -+    LIBS="$LIBS $PCRE_LIBS"
>>> -+    CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
>>> -+  ], [
>>> -+    AC_MSG_WARN([$PCRE_PKG_ERRORS])
>>> -   ])
>>> --
>>> -+fi
>>> - 
>>> - dnl CCache
>>> - AC_ARG_ENABLE([ccache], AS_HELP_STRING([--disable-ccache], [disable building and installation of ccache-swig executable (default enabled)]), [enable_ccache=$enableval], [enable_ccache=yes])
>>> --- 
>>> -1.7.9.5
>>> -
>>> diff --git a/recipes-devtools/swig/swig_2.0.10.bb b/recipes-devtools/swig/swig_2.0.10.bb
>>> deleted file mode 100644
>>> index 5f1ff5992359..000000000000
>>> --- a/recipes-devtools/swig/swig_2.0.10.bb
>>> +++ /dev/null
>>> @@ -1,11 +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 \
>>> -            file://0001-configure-use-pkg-config-for-pcre-detection.patch \
>>> -           "
>>> -
>>> -SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
>>> -SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
>>> -
>>>
>>
> 
> 
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-22 15:33   ` Joe MacDonald
  2016-02-22 15:57     ` Philip Balister
@ 2016-02-22 15:58     ` Burton, Ross
  2016-02-22 16:07       ` Joe MacDonald
  2016-02-22 16:19       ` Martin Jansa
  1 sibling, 2 replies; 12+ messages in thread
From: Burton, Ross @ 2016-02-22 15:58 UTC (permalink / raw)
  To: Joe MacDonald; +Cc: T.O. Radzy Radzykewycz, yocto@yoctoproject.org

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

On 22 February 2016 at 15:33, Joe MacDonald <Joe_MacDonald@mentor.com>
wrote:

> I'm also not against removing the local copy (I don't think it adds
> anything to the layer and occasionally causes headaches), but I really
> don't want to make meta-selinux dependent on meta-oe components, so I
> guess I'm voting for keeping it.
>

Luckily it's also in oe-core (meta/recipes-devtools/swig/swig_3.0.8.bb).

Ross

[-- Attachment #2: Type: text/html, Size: 952 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-22 15:58     ` Burton, Ross
@ 2016-02-22 16:07       ` Joe MacDonald
  2016-02-22 16:19       ` Martin Jansa
  1 sibling, 0 replies; 12+ messages in thread
From: Joe MacDonald @ 2016-02-22 16:07 UTC (permalink / raw)
  To: Burton, Ross; +Cc: T.O. Radzy Radzykewycz, yocto@yoctoproject.org

[-- Attachment #1: Type: text/plain, Size: 991 bytes --]

[Re: [yocto] [meta-selinux][PATCH] swig is in meta-oe, remove this copy] On 16.02.22 (Mon 15:58) Burton, Ross wrote:

> 
> On 22 February 2016 at 15:33, Joe MacDonald <Joe_MacDonald@mentor.com> wrote:
> 
>     I'm also not against removing the local copy (I don't think it adds
>     anything to the layer and occasionally causes headaches), but I really
>     don't want to make meta-selinux dependent on meta-oe components, so I
>     guess I'm voting for keeping it.
> 
> 
> Luckily it's also in oe-core (meta/recipes-devtools/swig/swig_3.0.8.bb).

And, y'know what?  I thought I'd had this very conversation with Armin
regarding it being in meta-security ages back, but since swig was still
in meta-selinux and Radzy mentioned it's also still in meta-oe, I
assumed it must've been some other package duplicated between
meta-selinux and meta-security (libcap-ng, perhaps?).

So with that, let's say my only concern no longer applies.  :-)

-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-22 15:58     ` Burton, Ross
  2016-02-22 16:07       ` Joe MacDonald
@ 2016-02-22 16:19       ` Martin Jansa
  2016-02-22 17:55         ` Mark Hatle
  1 sibling, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2016-02-22 16:19 UTC (permalink / raw)
  To: Burton, Ross; +Cc: T.O. Radzy Radzykewycz, yocto@yoctoproject.org

[-- Attachment #1: Type: text/plain, Size: 1106 bytes --]

On Mon, Feb 22, 2016 at 03:58:44PM +0000, Burton, Ross wrote:
> On 22 February 2016 at 15:33, Joe MacDonald <Joe_MacDonald@mentor.com>
> wrote:
> 
> > I'm also not against removing the local copy (I don't think it adds
> > anything to the layer and occasionally causes headaches), but I really
> > don't want to make meta-selinux dependent on meta-oe components, so I
> > guess I'm voting for keeping it.
> >
> 
> Luckily it's also in oe-core (meta/recipes-devtools/swig/swig_3.0.8.bb).

And it was removed from meta-oe couple months ago:

commit 02f98d1bc7dc585538df5c96c2b0ccdd857ec46f
Author:     Wenzong Fan <wenzong.fan@windriver.com>
AuthorDate: Thu Oct 8 01:31:36 2015 -0400
Commit:     Martin Jansa <Martin.Jansa@gmail.com>
CommitDate: Tue Oct 13 12:28:17 2015 +0200

    swig: remove package
    
    swig 3.0.6 has been moved to oe-croe:
      66923c6776da13bd4513a73c3f7c5e60d74eb0f3
    
    Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-22 16:19       ` Martin Jansa
@ 2016-02-22 17:55         ` Mark Hatle
  0 siblings, 0 replies; 12+ messages in thread
From: Mark Hatle @ 2016-02-22 17:55 UTC (permalink / raw)
  To: Martin Jansa, Burton, Ross; +Cc: T.O. Radzy Radzykewycz, yocto@yoctoproject.org

On 2/22/16 10:19 AM, Martin Jansa wrote:
> On Mon, Feb 22, 2016 at 03:58:44PM +0000, Burton, Ross wrote:
>> On 22 February 2016 at 15:33, Joe MacDonald <Joe_MacDonald@mentor.com>
>> wrote:
>>
>>> I'm also not against removing the local copy (I don't think it adds
>>> anything to the layer and occasionally causes headaches), but I really
>>> don't want to make meta-selinux dependent on meta-oe components, so I
>>> guess I'm voting for keeping it.
>>>
>>
>> Luckily it's also in oe-core (meta/recipes-devtools/swig/swig_3.0.8.bb).
> 
> And it was removed from meta-oe couple months ago:
> 
> commit 02f98d1bc7dc585538df5c96c2b0ccdd857ec46f
> Author:     Wenzong Fan <wenzong.fan@windriver.com>
> AuthorDate: Thu Oct 8 01:31:36 2015 -0400
> Commit:     Martin Jansa <Martin.Jansa@gmail.com>
> CommitDate: Tue Oct 13 12:28:17 2015 +0200
> 
>     swig: remove package
>     
>     swig 3.0.6 has been moved to oe-croe:
>       66923c6776da13bd4513a73c3f7c5e60d74eb0f3
>     
>     Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
>     Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> 
> 
> 

Yup.. lets yank it then from meta-selinux, no reason to keep carrying it forward.

--Mark


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-22 14:51   ` Radzykewycz, T (Radzy)
@ 2016-02-24 17:10     ` Burton, Ross
  2016-02-24 17:53       ` Radzykewycz, T (Radzy)
  0 siblings, 1 reply; 12+ messages in thread
From: Burton, Ross @ 2016-02-24 17:10 UTC (permalink / raw)
  To: Radzykewycz, T (Radzy); +Cc: yocto@yoctoproject.org

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

On 22 February 2016 at 14:51, Radzykewycz, T (Radzy) <radzy@windriver.com>
wrote:

> It's easy enough to update the one in meta-selinux, if the decision is
> to keep the duplicate.  I have a 3.0.6 => 3.0.8 update ready to upload
> to meta-oe, and I can do meta-selinux at the same time.
>

In master at least, swig isn't in meta-oe and oe-core has 3.0.8 already.
 oe-core jethro has 3.0.6.  Basically, there's no reason for anything
targeting jethro onwards to ship swig.

Ross

[-- Attachment #2: Type: text/html, Size: 912 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-24 17:10     ` Burton, Ross
@ 2016-02-24 17:53       ` Radzykewycz, T (Radzy)
  2016-02-28  2:09         ` Philip Tricca
  0 siblings, 1 reply; 12+ messages in thread
From: Radzykewycz, T (Radzy) @ 2016-02-24 17:53 UTC (permalink / raw)
  To: BURTON, ROSS; +Cc: yocto@yoctoproject.org


________________________________________
> From: Burton, Ross [ross.burton@intel.com]
> Sent: Wednesday, February 24, 2016 9:10 AM
> To: Radzykewycz, T (Radzy)
> Cc: Hatle, Mark; yocto@yoctoproject.org
> Subject: Re: [yocto] [meta-selinux][PATCH] swig is in meta-oe, remove this copy
> 
> On 22 February 2016 at 14:51, Radzykewycz, T (Radzy) <radzy@windriver.com<mailto:radzy@windriver.com>> wrote:
> It's easy enough to update the one in meta-selinux, if the decision is
> to keep the duplicate.  I have a 3.0.6 => 3.0.8 update ready to upload
> to meta-oe, and I can do meta-selinux at the same time.
> 
> In master at least, swig isn't in meta-oe and oe-core has 3.0.8 already.  oe-core jethro has 3.0.6.  Basically, there's no reason for anything targeting jethro onwards to ship swig.
> 
> Ross

Thanks, Ross.

Yes, I realized yesterday that I had been working on an older branch.  So
no change is needed.

Enjoy!

				-- radzy


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [meta-selinux][PATCH] swig is in meta-oe, remove this copy
  2016-02-24 17:53       ` Radzykewycz, T (Radzy)
@ 2016-02-28  2:09         ` Philip Tricca
  0 siblings, 0 replies; 12+ messages in thread
From: Philip Tricca @ 2016-02-28  2:09 UTC (permalink / raw)
  To: T.O. Radzy Radzykewycz; +Cc: yocto

On 02/24/2016 09:53 AM, Radzykewycz, T (Radzy) wrote:
> 
> ________________________________________
>> From: Burton, Ross [ross.burton@intel.com]
>> Sent: Wednesday, February 24, 2016 9:10 AM
>> To: Radzykewycz, T (Radzy)
>> Cc: Hatle, Mark; yocto@yoctoproject.org
>> Subject: Re: [yocto] [meta-selinux][PATCH] swig is in meta-oe, remove this copy
>>
>> On 22 February 2016 at 14:51, Radzykewycz, T (Radzy) <radzy@windriver.com<mailto:radzy@windriver.com>> wrote:
>> It's easy enough to update the one in meta-selinux, if the decision is
>> to keep the duplicate.  I have a 3.0.6 => 3.0.8 update ready to upload
>> to meta-oe, and I can do meta-selinux at the same time.
>>
>> In master at least, swig isn't in meta-oe and oe-core has 3.0.8 already.  oe-core jethro has 3.0.6.  Basically, there's no reason for anything targeting jethro onwards to ship swig.
>>
>> Ross
> 
> Thanks, Ross.
> 
> Yes, I realized yesterday that I had been working on an older branch.  So
> no change is needed.

Thanks Radzy. I'm just catching up on this thread. It looks like swig
was removed from meta-selinux in
321848ab57d7d68c2033d22af1bedd3b86cafc3b so I'm leaving this alone.

Thanks,
Philip


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2016-02-28  2:09 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-19 22:59 [meta-selinux][PATCH] swig is in meta-oe, remove this copy T.O. Radzy Radzykewycz
2016-02-22 14:40 ` Mark Hatle
2016-02-22 14:51   ` Radzykewycz, T (Radzy)
2016-02-24 17:10     ` Burton, Ross
2016-02-24 17:53       ` Radzykewycz, T (Radzy)
2016-02-28  2:09         ` Philip Tricca
2016-02-22 15:33   ` Joe MacDonald
2016-02-22 15:57     ` Philip Balister
2016-02-22 15:58     ` Burton, Ross
2016-02-22 16:07       ` Joe MacDonald
2016-02-22 16:19       ` Martin Jansa
2016-02-22 17:55         ` Mark Hatle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.