mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-20 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

swig: update 4.0.2 -> 4.1.0

Browse Source 
swig has transitioned pcre -> pcre2
Update 0001-configure-use-pkg-config-for-pcre-detection.patch
accordingly.

(From OE-Core rev: 53e51ded320fb35fb53d496e832b6527372f58ed)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-11-20 14:31:08 +01:00
committed by Richard Purdie
parent a00b2f97f3
commit deef918ab2
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-devtools/swig/swig.inc
View File

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
SECTION = "devel" SECTION = "devel"
DEPENDS = "libpcre bison-native" DEPENDS = "libpcre2 bison-native"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/"

46
meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
View File

@@ -1,52 +1,56 @@
From 5c4d6d8538994d5fe9b3b46bfafaf0a605e3bda6 Mon Sep 17 00:00:00 2001 From ffb785ed8d3cac3c28e014b1238d93e2bc1f0c01 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen.kooi@linaro.org> From: Koen Kooi <koen.kooi@linaro.org>
Date: Tue, 17 Jun 2014 08:18:17 +0200 Date: Tue, 17 Jun 2014 08:18:17 +0200
Subject: [PATCH] configure: use pkg-config for pcre detection Subject: [PATCH] configure: use pkg-config for pcre detection
Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Upstream-Status: Pending Upstream-Status: Pending
---
configure.ac | 38 +++++++-------------------------------
1 file changed, 7 insertions(+), 31 deletions(-)
---
configure.ac | 39 +++++++--------------------------------
1 file changed, 7 insertions(+), 32 deletions(-)
diff --git a/configure.ac b/configure.ac
index f88004a..3a2b47c 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -52,38 +52,14 @@ AC_MSG_RESULT([$with_pcre]) @@ -57,39 +57,14 @@ AC_MSG_RESULT([$with_pcre])
dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script 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 if test x"${with_pcre}" = xyes ; then
- AC_MSG_CHECKING([whether to use local PCRE]) - AC_MSG_CHECKING([whether to use local PCRE2])
- local_pcre_config=no - local_pcre_config=no
- if test -z $PCRE_CONFIG; then - if test -z "$PCRE2_CONFIG"; then
- if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then - if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then
- PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config - PCRE2_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre2-config
- local_pcre_config=$PCRE_CONFIG - local_pcre_config=$PCRE2_CONFIG
- fi - fi
- fi - fi
- AC_MSG_RESULT([$local_pcre_config]) - AC_MSG_RESULT([$local_pcre_config])
-fi -fi
-AS_IF([test "x$with_pcre" != xno], -AS_IF([test "x$with_pcre" != xno],
- [AX_PATH_GENERIC([pcre], - [AX_PATH_GENERIC([pcre2],
- [], dnl Minimal version of PCRE we need -- accept any - [], dnl Minimal version of PCRE we need -- accept any
- [], dnl custom sed script for version parsing is not needed - [], dnl custom sed script for version parsing is not needed
- [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) - [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE2 library])
- LIBS="$LIBS $PCRE_LIBS" - LIBS="$LIBS $PCRE2_LIBS"
- CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" - CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS"
- ], - ],
- [AC_MSG_FAILURE([ - [AC_MSG_FAILURE([
- Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions) - Cannot find pcre2-config script from PCRE2 (Perl Compatible Regular Expressions)
- library package. This dependency is needed for configure to complete, - library package. This dependency is needed for configure to complete,
- Either: - Either:
- - Install the PCRE developer package on your system (preferred approach). - - Install the PCRE2 developer package on your system (preferred approach).
- - Download the PCRE source tarball, build and install on your system - - Download the PCRE2 source tarball, build and install on your system
- as you would for any package built from source distribution. - 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 - - 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. - link against. Run 'Tools/pcre-build.sh --help' for instructions.
- (quite easy and does not require privileges to install PCRE on your system) - (quite easy and does not require privileges to install PCRE2 on your system)
- - Use configure --without-pcre to disable regular expressions support in SWIG - - Use configure --without-pcre to disable regular expressions support in SWIG
- (not recommended).]) - (not recommended).])
- ]) - ],
+ PKG_CHECK_MODULES([PCRE], [libpcre], [ - [],[],[--libs8])
+ PKG_CHECK_MODULES([PCRE], [libpcre2], [
+ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) + AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
+ LIBS="$LIBS $PCRE_LIBS" + LIBS="$LIBS $PCRE_LIBS"
+ CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" + CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"

2
meta/recipes-devtools/swig/swig_4.0.2.bb → meta/recipes-devtools/swig/swig_4.1.0.bb
View File

@@ -4,4 +4,4 @@ SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.pat
file://0001-configure-use-pkg-config-for-pcre-detection.patch \ file://0001-configure-use-pkg-config-for-pcre-detection.patch \
file://determinism.patch \ file://determinism.patch \
" "
SRC_URI[sha256sum] = "d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc" SRC_URI[sha256sum] = "d6a9a8094e78f7cfb6f80a73cc271e1fe388c8638ed22668622c2c646df5bb3d"