From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by mail.openembedded.org (Postfix) with ESMTP id 5513175E7D for ; Thu, 20 Aug 2015 12:15:49 +0000 (UTC) Received: by wicja10 with SMTP id ja10so143951129wic.1 for ; Thu, 20 Aug 2015 05:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=RImfedA5iyrIE8d9FBn/CoFwl5Zp5pl1gxILE5nx58M=; b=GyQ913rOYW6THz32cXEfPOagNU3SuBEbNoEGJy33BlgXfiP7ZGIKNsChu+GHyJnxnV QMqbaXXegDTR9nrr6GqyHRpo+0UxugtfOr1Jbfd5nF2HPSz4/mHhix8SAbAY/xSSSYSb VZuVNVilqwwHgd8i8LhGDY5MsZ6alt06hhiz7saKCUXH+9e3nl92dKrKovUokK98l2k8 kCboxBlpMBzlP5k3K2WxMP5P2ubQ2/gkvyYJRmqJdP8BW3eDtek1BSjIPdikrenb5u58 kd9zOBCcZ+JNeigMNakpNUeFRzx7nS99btl/ol7Ci96yNQ50I9C+XKNwy40wgTdFWyqb oHhQ== X-Received: by 10.180.208.105 with SMTP id md9mr12383685wic.89.1440072949561; Thu, 20 Aug 2015 05:15:49 -0700 (PDT) Received: from localhost (ip-86-49-34-37.net.upcbroadband.cz. [86.49.34.37]) by smtp.gmail.com with ESMTPSA id r19sm5906516wib.7.2015.08.20.05.15.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Aug 2015 05:15:48 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa Date: Thu, 20 Aug 2015 14:16:15 +0200 To: wenzong fan Message-ID: <20150820121615.GA2446@jama> References: <557dc413728ff7c18f48e1ffaa9f54b7ccb8e3af.1439967611.git.wenzong.fan@windriver.com> <20150819131201.GA2441@jama> <55D52DDF.7040408@windriver.com> MIME-Version: 1.0 In-Reply-To: <55D52DDF.7040408@windriver.com> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 1/2] swig: add package 3.0.2 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2015 12:15:51 -0000 X-Groupsio-MsgNum: 69723 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="x+6KMIRAuhnl3hBn" Content-Disposition: inline --x+6KMIRAuhnl3hBn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 20, 2015 at 09:31:11AM +0800, wenzong fan wrote: > On 08/19/2015 09:12 PM, Martin Jansa wrote: > > On Wed, Aug 19, 2015 at 03:29:28AM -0400, wenzong.fan@windriver.com wro= te: > >> From: Wenzong Fan > >> > >> Pull package from meta-oe to oe-core: > >> meta-oe commit: 8b7d90d8e4c3338f94c588fc7e4a88319bd9a9e8 > > > > There is patch for meta-oe to upgrade it to 3.0.6 (which isn't > > compatible with some recipes, but fixes for that were sent as well > > already). >=20 > Hi Martin, >=20 > Do you mean the fix for python-m2crypto? > ---------------------------------------- > commit 74de7be5a464e184fed64661e2a45f2f6fac58a5 > Author: Li xin > Date: Thu Jul 30 18:31:25 2015 +0800 >=20 > python-m2crypto: Error fix for swig >=3D 3.0.5 >=20 > After swig upgrade to 3.0.6, build the recipes which > depends on python-m2crypto will occur errors like this: > "SALT_LEN =3D m2.PKCS5_SALT_LEN > AttributeError: 'module' object has no attribute 'PKCS5_SALT_LEN'" >=20 > Reference > =20 > https://github.com/martinpaljak/M2Crypto/issues/60#issuecomment-75735489 >=20 > Signed-off-by: Li Xin > Signed-off-by: Martin Jansa > ----------------------------------------- >=20 > If the fixes are not applied to swig directly, I think this patch is OK.= =20 > I'll consider to remove swig from meta-oe next step ... Yes and this swig upgrade: commit 9cc54e10efa5ca70d9980f833a8e5a310e5ad21d Author: Li xin Date: Thu Jul 23 18:03:31 2015 +0800 swig: upgrade 3.0.2 -> 3.0.6 Signed-off-by: Li Xin Signed-off-by: Martin Jansa both changes are now in meta-oe, so if you add swig-3.0.2 instead of 3.0.5 to oe-core then you will need to upgrade it first before removing it from meta-oe. > Thanks > Wenzong >=20 > > > >> It's required for libcap-ng to build python bindings. > >> > >> With adding it to oe-core, the copies from following layers could > >> be removed: > >> > >> * meta-oe, meta-selinux, meta-intel-iot-middleware ... > >> > >> Signed-off-by: Wenzong Fan > >> --- > >> meta/recipes-devtools/swig/swig.inc | 63 ++++++++++++= ++++++++ > >> ...lf-exe-for-swig-swiglib-on-non-Win32-plat.patch | 69 ++++++++++++= ++++++++++ > >> ...nfigure-use-pkg-config-for-pcre-detection.patch | 64 ++++++++++++= ++++++++ > >> meta/recipes-devtools/swig/swig_3.0.2.bb | 8 +++ > >> 4 files changed, 204 insertions(+) > >> create mode 100644 meta/recipes-devtools/swig/swig.inc > >> create mode 100644 meta/recipes-devtools/swig/swig/0001-Use-proc-sel= f-exe-for-swig-swiglib-on-non-Win32-plat.patch > >> create mode 100644 meta/recipes-devtools/swig/swig/0001-configure-us= e-pkg-config-for-pcre-detection.patch > >> create mode 100644 meta/recipes-devtools/swig/swig_3.0.2.bb > >> > >> diff --git a/meta/recipes-devtools/swig/swig.inc b/meta/recipes-devtoo= ls/swig/swig.inc > >> new file mode 100644 > >> index 0000000..9821fa5 > >> --- /dev/null > >> +++ b/meta/recipes-devtools/swig/swig.inc > >> @@ -0,0 +1,63 @@ > >> +DESCRIPTION =3D "SWIG - Simplified Wrapper and Interface Generator" > >> +HOMEPAGE =3D "http://swig.sourceforge.net/" > >> +LICENSE =3D "BSD & GPLv3" > >> +LIC_FILES_CHKSUM =3D "file://LICENSE;md5=3De7807a6282784a7dde4c846626= b08fc6 \ > >> + file://LICENSE-GPL;md5=3Dd32239bcb673463ab874e80d= 47fae504 \ > >> + file://LICENSE-UNIVERSITIES;md5=3D8ce9dcc8f7c994d= e4a408b205c72ba08" > >> + > >> +SECTION =3D "devel" > >> + > >> +DEPENDS =3D "libpcre python" > >> + > >> +SRC_URI =3D "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" > >> + > >> +inherit autotools pythonnative > >> + > >> +EXTRA_OECONF =3D " \ > >> + --with-python=3D${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 =3D "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 > >> +} > >> + > >> +do_install_append_class-nativesdk() { > >> + cd ${D}${bindir} > >> + ln -s swig swig2.0 > >> +} > >> + > >> +def swiglib_relpath(d): > >> + swiglib =3D d.getVar('datadir', True) + "/" + d.getVar('BPN', Tru= e) + "/" + 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=3D'`dirname $''realpat= h`'/${@swiglib_relpath(d)} > >> +} > >> diff --git a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-fo= r-swig-swiglib-on-non-Win32-plat.patch b/meta/recipes-devtools/swig/swig/00= 01-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch > >> new file mode 100644 > >> index 0000000..81df3e2 > >> --- /dev/null > >> +++ b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-= swiglib-on-non-Win32-plat.patch > >> @@ -0,0 +1,69 @@ > >> +From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001 > >> +From: "NODA, Kai" > >> +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=3D29179733 > >> + > >> +--- > >> + 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[] =3D "$Id$"; > >> + #include "cparse.h" > >> + #include > >> + #include // for INT_MAX > >> ++#ifndef _WIN32 > >> ++#include > >> ++#include // for readlink > >> ++#include // 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 =3D getenv("SWIG_LIB")) =3D=3D (char *) 0) { > >> ++ char *p; > >> + #if defined(_WIN32) > >> + char buf[MAX_PATH]; > >> +- char *p; > >> + if (!(GetModuleFileName(0, buf, MAX_PATH) =3D=3D 0 || (p =3D str= rchr(buf, '\\')) =3D=3D 0)) { > >> + *(p + 1) =3D '\0'; > >> + SwigLib =3D NewStringf("%sLib", buf); // Native windows instal= lation path > >> +@@ -914,7 +919,22 @@ int SWIG_main(int argc, char *argv[], Language *= l) { > >> + if (Len(SWIG_LIB_WIN_UNIX) > 0) > >> + SwigLibWinUnix =3D NewString(SWIG_LIB_WIN_UNIX); // Unix insta= llation path using a drive letter (for msys/mingw) > >> + #else > >> +- SwigLib =3D NewString(SWIG_LIB); > >> ++ char buf[PATH_MAX]; > >> ++ if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) && > >> ++ (p =3D ::strstr(buf, "/bin/swig"))) { > >> ++ int major, minor, patch; > >> ++ const int ret =3D ::sscanf(VERSION, "%d.%d.%d", &major, &min= or, &patch); > >> ++ if (3 =3D=3D ret) { > >> ++ const ::ptrdiff_t dir_part_len =3D p - buf; > >> ++ ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%= d.%d", major, minor, patch); > >> ++ struct ::stat stat_res; > >> ++ if (0 =3D=3D ::stat(buf, &stat_res) && S_ISDIR(stat_res.= st_mode)) { > >> ++ SwigLib =3D NewString(buf); > >> ++ } > >> ++ } > >> ++ } > >> ++ if (NULL =3D=3D SwigLib) > >> ++ SwigLib =3D NewString(SWIG_LIB); > >> + #endif > >> + } else { > >> + SwigLib =3D NewString(c); > >> +-- > >> +1.7.9.5 > >> + > >> diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-co= nfig-for-pcre-detection.patch b/meta/recipes-devtools/swig/swig/0001-config= ure-use-pkg-config-for-pcre-detection.patch > >> new file mode 100644 > >> index 0000000..1b1128a > >> --- /dev/null > >> +++ b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-fo= r-pcre-detection.patch > >> @@ -0,0 +1,64 @@ > >> +From 5c4d6d8538994d5fe9b3b46bfafaf0a605e3bda6 Mon Sep 17 00:00:00 2001 > >> +From: Koen Kooi > >> +Date: Tue, 17 Jun 2014 08:18:17 +0200 > >> +Subject: [PATCH] configure: use pkg-config for pcre detection > >> + > >> +Signed-off-by: Koen Kooi > >> +Upstream-Status: pending > >> +--- > >> + configure.ac | 38 +++++++------------------------------- > >> + 1 file changed, 7 insertions(+), 31 deletions(-) > >> + > >> +diff --git a/configure.ac b/configure.ac > >> +index 0c984b7..6edcec1 100644 > >> +--- a/configure.ac > >> ++++ b/configure.ac > >> +@@ -70,38 +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}" =3D xyes ; then > >> +- AC_MSG_CHECKING([whether to use local PCRE]) > >> +- local_pcre_config=3Dno > >> +- if test -z $PCRE_CONFIG; then > >> +- if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then > >> +- PCRE_CONFIG=3D`pwd`/pcre/pcre-swig-install/bin/pcre-config > >> +- local_pcre_config=3D$PCRE_CONFIG > >> +- fi > >> +- fi > >> +- AC_MSG_RESULT([$local_pcre_config]) > >> +-fi > >> +-AS_IF([test "x$with_pcre" !=3D 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=3D"$LIBS $PCRE_LIBS" > >> +- CPPFLAGS=3D"$CPPFLAGS $PCRE_CFLAGS" > >> +- ], > >> +- [AC_MSG_FAILURE([ > >> +- Cannot find pcre-config script from PCRE (Perl Compatible Re= gular Expressions) > >> +- library package. This dependency is needed for configure to = complete, > >> +- Either: > >> +- - Install the PCRE developer package on your system (preferr= ed approach). > >> +- - Download the PCRE source tarball, build and install on you= r system > >> +- as you would for any package built from source distributio= n. > >> +- - Use the Tools/pcre-build.sh script to build PCRE just for = SWIG to statically > >> +- link against. Run 'Tools/pcre-build.sh --help' for instruc= tions. > >> +- (quite easy and does not require privileges to install PCR= E on your system) > >> +- - Use configure --without-pcre to disable regular expression= s support in SWIG > >> +- (not recommended).]) > >> +- ]) > >> ++ PKG_CHECK_MODULES([PCRE], [libpcre], [ > >> ++ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) > >> ++ LIBS=3D"$LIBS $PCRE_LIBS" > >> ++ CPPFLAGS=3D"$CPPFLAGS $PCRE_CFLAGS" > >> ++ ], [ > >> ++ AC_MSG_WARN([$PCRE_PKG_ERRORS]) > >> + ]) > >> ++fi > >> + > >> + > >> + dnl CCache > >> +-- > >> +1.9.3 > >> + > >> diff --git a/meta/recipes-devtools/swig/swig_3.0.2.bb b/meta/recipes-d= evtools/swig/swig_3.0.2.bb > >> new file mode 100644 > >> index 0000000..ac41914 > >> --- /dev/null > >> +++ b/meta/recipes-devtools/swig/swig_3.0.2.bb > >> @@ -0,0 +1,8 @@ > >> +require ${BPN}.inc > >> + > >> +SRC_URI +=3D "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-W= in32-plat.patch \ > >> + file://0001-configure-use-pkg-config-for-pcre-detection.p= atch \ > >> + " > >> + > >> +SRC_URI[md5sum] =3D "62f9b0d010cef36a13a010dc530d0d41" > >> +SRC_URI[sha256sum] =3D "a2669657cabcedc371f63c0457407a183e0b6b2ef4e7e= 303c1ec9a3964cc7813" > >> -- > >> 1.9.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core@lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --x+6KMIRAuhnl3hBn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlXVxQ4ACgkQN1Ujt2V2gByoNACgtvuGyUT4LJpSE7RXAd0sW+Uz 2N8AoLe6EAbbdo6vGqIv8OW54a5W5ieg =ABPO -----END PGP SIGNATURE----- --x+6KMIRAuhnl3hBn--