summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-10-08 01:23:26 -0400
committerJoe MacDonald <joe_macdonald@mentor.com>2015-10-22 10:49:21 -0400
commit321848ab57d7d68c2033d22af1bedd3b86cafc3b (patch)
treee78187ee1ad4bf6fae94373c92872f6818d35060
parentb00d2db9f0741bd992cb3d2adccca2b42d66beb6 (diff)
downloadmeta-selinux-321848ab57d7d68c2033d22af1bedd3b86cafc3b.tar.gz
swig: remove package
swig 3.0.6 has been added to oe-croe: 66923c6776da13bd4513a73c3f7c5e60d74eb0f3 No change need to port. Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-devtools/swig/swig.inc59
-rw-r--r--recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch69
-rw-r--r--recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch65
-rw-r--r--recipes-devtools/swig/swig_2.0.10.bb11
4 files changed, 0 insertions, 204 deletions
diff --git a/recipes-devtools/swig/swig.inc b/recipes-devtools/swig/swig.inc
deleted file mode 100644
index 74ce506..0000000
--- a/recipes-devtools/swig/swig.inc
+++ /dev/null
@@ -1,59 +0,0 @@
1DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
2HOMEPAGE = "http://swig.sourceforge.net/"
3LICENSE = "BSD & GPLv3"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
5 file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
6 file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
7
8SECTION = "devel"
9INC_PR = "r3"
10
11DEPENDS = "libpcre python"
12
13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
14
15inherit autotools pythonnative
16
17EXTRA_OECONF = " \
18 --with-python=${PYTHON} \
19 --without-allegrocl \
20 --without-android \
21 --without-boost \
22 --without-chicken \
23 --without-clisp \
24 --without-csharp \
25 --without-d \
26 --without-gcj \
27 --without-go \
28 --without-guile \
29 --without-java \
30 --without-lua \
31 --without-mzscheme \
32 --without-ocaml \
33 --without-octave \
34 --without-perl5 \
35 --without-pike \
36 --without-php \
37 --without-python3 \
38 --without-r \
39 --without-ruby \
40 --without-tcl \
41"
42
43BBCLASSEXTEND = "native nativesdk"
44
45do_configure() {
46 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
47 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
48 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
49 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
50 oe_runconf
51}
52
53def swiglib_relpath(d):
54 swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
55 return os.path.relpath(swiglib, d.getVar('bindir', True))
56
57do_install_append_class-native() {
58 create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
59}
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 81df3e2..0000000
--- a/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001
2From: "NODA, Kai" <nodakai@gmail.com>
3Date: Sun, 22 Apr 2012 17:01:02 +0900
4Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
5 platforms.
6
7If it wasn't found, then fall back to a fixed string just as before.
8
9Upstream-Status: Submitted
10http://sourceforge.net/mailarchive/message.php?msg_id=29179733
11
12---
13 Source/Modules/main.cxx | 24 ++++++++++++++++++++++--
14 1 file changed, 22 insertions(+), 2 deletions(-)
15
16diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
17index d2f5d3b..cbb0a12 100644
18--- a/Source/Modules/main.cxx
19+++ b/Source/Modules/main.cxx
20@@ -26,6 +26,11 @@ char cvsroot_main_cxx[] = "$Id$";
21 #include "cparse.h"
22 #include <ctype.h>
23 #include <limits.h> // for INT_MAX
24+#ifndef _WIN32
25+#include <cstddef>
26+#include <unistd.h> // for readlink
27+#include <sys/stat.h> // for stat
28+#endif
29
30 // Global variables
31
32@@ -902,9 +907,9 @@ int SWIG_main(int argc, char *argv[], Language *l) {
33
34 // Check for SWIG_LIB environment variable
35 if ((c = getenv("SWIG_LIB")) == (char *) 0) {
36+ char *p;
37 #if defined(_WIN32)
38 char buf[MAX_PATH];
39- char *p;
40 if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
41 *(p + 1) = '\0';
42 SwigLib = NewStringf("%sLib", buf); // Native windows installation path
43@@ -914,7 +919,22 @@ int SWIG_main(int argc, char *argv[], Language *l) {
44 if (Len(SWIG_LIB_WIN_UNIX) > 0)
45 SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
46 #else
47- SwigLib = NewString(SWIG_LIB);
48+ char buf[PATH_MAX];
49+ if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) &&
50+ (p = ::strstr(buf, "/bin/swig"))) {
51+ int major, minor, patch;
52+ const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
53+ if (3 == ret) {
54+ const ::ptrdiff_t dir_part_len = p - buf;
55+ ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch);
56+ struct ::stat stat_res;
57+ if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) {
58+ SwigLib = NewString(buf);
59+ }
60+ }
61+ }
62+ if (NULL == SwigLib)
63+ SwigLib = NewString(SWIG_LIB);
64 #endif
65 } else {
66 SwigLib = NewString(c);
67--
681.7.9.5
69
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 5644b15..0000000
--- a/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From cd596816f28407ac403bcb2249f964cefd81f22a Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen.kooi@linaro.org>
3Date: Tue, 17 Jun 2014 08:18:17 +0200
4Subject: [PATCH] configure: use pkg-config for pcre detection
5
6Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
7Upstream-Status: pending
8---
9 configure.ac | 39 +++++++--------------------------------
10 1 file changed, 7 insertions(+), 32 deletions(-)
11
12diff --git a/configure.ac b/configure.ac
13index c94c2e9..24420c5 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -70,39 +70,14 @@ AC_MSG_RESULT([$with_pcre])
17
18 dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
19 if test x"${with_pcre}" = xyes ; then
20- AC_MSG_CHECKING([whether to use local PCRE])
21- local_pcre_config=no
22- if test -z $PCRE_CONFIG; then
23- if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
24- PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
25- local_pcre_config=$PCRE_CONFIG
26- fi
27- fi
28- AC_MSG_RESULT([$local_pcre_config])
29-fi
30-AS_IF([test "x$with_pcre" != xno],
31- [AX_PATH_GENERIC([pcre],
32- [], dnl Minimal version of PCRE we need -- accept any
33- [], dnl custom sed script for version parsing is not needed
34- [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
35- LIBS="$LIBS $PCRE_LIBS"
36- CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
37- ],
38- [AC_MSG_FAILURE([
39- Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
40- library package. This dependency is needed for configure to complete,
41- Either:
42- - Install the PCRE developer package on your system (preferred approach).
43- - Download the PCRE source tarball, build and install on your system
44- as you would for any package built from source distribution.
45- - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
46- link against. Run 'Tools/pcre-build.sh --help' for instructions.
47- (quite easy and does not require privileges to install PCRE on your system)
48- - Use configure --without-pcre to disable regular expressions support in SWIG
49- (not recommended).])
50- ])
51+ PKG_CHECK_MODULES([PCRE], [libpcre], [
52+ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
53+ LIBS="$LIBS $PCRE_LIBS"
54+ CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
55+ ], [
56+ AC_MSG_WARN([$PCRE_PKG_ERRORS])
57 ])
58-
59+fi
60
61 dnl CCache
62 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])
63--
641.7.9.5
65
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 5f1ff59..0000000
--- a/recipes-devtools/swig/swig_2.0.10.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \
6 file://0001-configure-use-pkg-config-for-pcre-detection.patch \
7 "
8
9SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
10SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
11