summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-devtools/swig/swig.inc63
-rw-r--r--meta-oe/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch69
-rw-r--r--meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch64
-rw-r--r--meta-oe/recipes-devtools/swig/swig_3.0.6.bb8
4 files changed, 0 insertions, 204 deletions
diff --git a/meta-oe/recipes-devtools/swig/swig.inc b/meta-oe/recipes-devtools/swig/swig.inc
deleted file mode 100644
index 9821fa560b..0000000000
--- a/meta-oe/recipes-devtools/swig/swig.inc
+++ /dev/null
@@ -1,63 +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"
9
10DEPENDS = "libpcre python"
11
12SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
13
14inherit autotools pythonnative
15
16EXTRA_OECONF = " \
17 --with-python=${PYTHON} \
18 --without-allegrocl \
19 --without-android \
20 --without-boost \
21 --without-chicken \
22 --without-clisp \
23 --without-csharp \
24 --without-d \
25 --without-gcj \
26 --without-go \
27 --without-guile \
28 --without-java \
29 --without-lua \
30 --without-mzscheme \
31 --without-ocaml \
32 --without-octave \
33 --without-perl5 \
34 --without-pike \
35 --without-php \
36 --without-python3 \
37 --without-r \
38 --without-ruby \
39 --without-tcl \
40"
41
42BBCLASSEXTEND = "native nativesdk"
43
44do_configure() {
45 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
46 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
47 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
48 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
49 oe_runconf
50}
51
52do_install_append_class-nativesdk() {
53 cd ${D}${bindir}
54 ln -s swig swig2.0
55}
56
57def swiglib_relpath(d):
58 swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
59 return os.path.relpath(swiglib, d.getVar('bindir', True))
60
61do_install_append_class-native() {
62 create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
63}
diff --git a/meta-oe/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/meta-oe/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
deleted file mode 100644
index 81df3e264f..0000000000
--- a/meta-oe/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/meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
deleted file mode 100644
index 1b1128acab..0000000000
--- a/meta-oe/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From 5c4d6d8538994d5fe9b3b46bfafaf0a605e3bda6 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 | 38 +++++++-------------------------------
10 1 file changed, 7 insertions(+), 31 deletions(-)
11
12diff --git a/configure.ac b/configure.ac
13index 0c984b7..6edcec1 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -70,38 +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+fi
59
60
61 dnl CCache
62--
631.9.3
64
diff --git a/meta-oe/recipes-devtools/swig/swig_3.0.6.bb b/meta-oe/recipes-devtools/swig/swig_3.0.6.bb
deleted file mode 100644
index 2a0917e4e9..0000000000
--- a/meta-oe/recipes-devtools/swig/swig_3.0.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require ${BPN}.inc
2
3SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \
4 file://0001-configure-use-pkg-config-for-pcre-detection.patch \
5 "
6SRC_URI[md5sum] = "df43ae271642bcfa61c1e59f970f9963"
7SRC_URI[sha256sum] = "c67f63ea11956106e4cda66416d5020330dc4ce2ee45057d39a9494ce33eca05"
8
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-22 13:35:52 +0000