mirror of
https://git.yoctoproject.org/poky
synced 2026-03-17 04:39:40 +01:00
swig: convert from autotools to cmake
Drop patches: 0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch (superseded long time ago by native wrapper) 0001-configure-use-pkg-config-for-pcre-detection.patch (autotools-specific) Drop all autoconf options and native python dependency as cmake configuration doesn't contain those. (From OE-Core rev: 614e9b387f0774856e4ef2a1633d269f06b5da0f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
307e2bc612
commit
c84c11b951
@@ -1,65 +0,0 @@
|
||||
From b88a98348b3841f0b702e314631883d46f9f362d 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 76b4f9d..de0a512 100644
|
||||
--- a/Source/Modules/main.cxx
|
||||
+++ b/Source/Modules/main.cxx
|
||||
@@ -25,6 +25,11 @@
|
||||
#include <ctype.h>
|
||||
#include <errno.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
|
||||
|
||||
@@ -895,9 +900,9 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) {
|
||||
|
||||
// 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
|
||||
@@ -907,7 +912,22 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) {
|
||||
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,63 +0,0 @@
|
||||
From 57a15651b46a0f1f84a4dd15d67d104fbfbe3f6e 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 c060028..a330266 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -49,39 +49,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 PCRE2])
|
||||
- local_pcre_config=no
|
||||
- if test -z "$PCRE2_CONFIG"; then
|
||||
- if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then
|
||||
- PCRE2_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre2-config
|
||||
- local_pcre_config=$PCRE2_CONFIG
|
||||
- fi
|
||||
- fi
|
||||
- AC_MSG_RESULT([$local_pcre_config])
|
||||
-fi
|
||||
-AS_IF([test "x$with_pcre" != xno],
|
||||
- [AX_PATH_GENERIC([pcre2],
|
||||
- [], 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 PCRE2 library])
|
||||
- LIBS="$LIBS $PCRE2_LIBS"
|
||||
- CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS"
|
||||
- ],
|
||||
- [AC_MSG_FAILURE([
|
||||
- Cannot find pcre2-config script from PCRE2 (Perl Compatible Regular Expressions)
|
||||
- library package. This dependency is needed for configure to complete,
|
||||
- Either:
|
||||
- - Install the PCRE2 developer package on your system (preferred approach).
|
||||
- - Download the PCRE2 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 PCRE2 just for SWIG to statically
|
||||
- link against. Run 'Tools/pcre-build.sh --help' for instructions.
|
||||
- (quite easy and does not require privileges to install PCRE2 on your system)
|
||||
- - Use configure --without-pcre to disable regular expressions support in SWIG
|
||||
- (not recommended).])
|
||||
- ],
|
||||
- [],[],[--libs8])
|
||||
+ PKG_CHECK_MODULES([PCRE], [libpcre2], [
|
||||
+ 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
|
||||
@@ -13,51 +13,16 @@ SECTION = "devel"
|
||||
DEPENDS = "libpcre2 bison-native"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
|
||||
file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \
|
||||
file://0001-configure-use-pkg-config-for-pcre-detection.patch \
|
||||
file://determinism.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8"
|
||||
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/"
|
||||
UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
inherit autotools python3native pkgconfig
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--with-python3=${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-r \
|
||||
--without-ruby \
|
||||
--without-tcl \
|
||||
"
|
||||
|
||||
EXTRA_AUTORECONF += "-I Tools/config"
|
||||
inherit cmake pkgconfig
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
# necessary together with bison dependency until a new upstream version after
|
||||
# 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch
|
||||
do_configure:append() {
|
||||
mkdir -p ${B}/Source/CParse
|
||||
}
|
||||
|
||||
do_install:append:class-nativesdk() {
|
||||
cd ${D}${bindir}
|
||||
ln -s swig swig2.0
|
||||
@@ -70,3 +35,11 @@ def swiglib_relpath(d):
|
||||
do_install:append:class-native() {
|
||||
create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
|
||||
}
|
||||
|
||||
PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess"
|
||||
src_package_preprocess () {
|
||||
# Trim build paths from comments and defines in generated sources to ensure reproducibility
|
||||
sed -i -e "s,${WORKDIR},,g" \
|
||||
-e "s,YY_YY_.*_CPARSE_PARSER_H_INCLUDED,YY_YY_CPARSE_PARSER_H_INCLUDED,g" \
|
||||
${B}/Source/CParse/parser.*
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user