All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-python][PATCH] python3-m2crypto: Pass correct ABI defines to swig
@ 2021-05-08  5:49 Khem Raj
  2021-05-08  8:26 ` Martin Jansa
  0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-05-08  5:49 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Khem Raj, Martin Jansa

This ensures that WORDSIZE is as per the target, currenrly this does not
get it right for cross compiling, and OE uses multilib headers by
default which means if WORDSIZE is wrong it will go on to include wtong
headers due to these artificial stubs

Fixes
swig -python -py3 -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include-fixed -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/lib/aarch64-oe-linux/11.1.0/include -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/python3.9 -I/usr/include/openssl -includeall -modern -builtin -outdir TOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/M2Crypto-0.37.1/M2Crypto -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i
  TOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/openssl/opensslconf.h:23: Error: Unable to find 'openssl/opensslconf-32.h'

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-devtools/python/python3-m2crypto_0.37.1.bb        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
index 896d9d2cc4..305987d4f0 100644
--- a/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
+++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
@@ -33,7 +33,9 @@ DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}"
 
 SWIG_FEATURES_x86 = "-D__i386__"
 SWIG_FEATURES_x32 = "-D__ILP32__"
-SWIG_FEATURES ?= "-D__${HOST_ARCH}__"
+
+SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']}"
+
 export SWIG_FEATURES
 
 # Get around a problem with swig, but only if the
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [meta-python][PATCH] python3-m2crypto: Pass correct ABI defines to swig
  2021-05-08  5:49 [meta-python][PATCH] python3-m2crypto: Pass correct ABI defines to swig Khem Raj
@ 2021-05-08  8:26 ` Martin Jansa
  2021-05-08 15:58   ` Khem Raj
  0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2021-05-08  8:26 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 2759 bytes --]

Thanks, this works in my setup (qemuarm64 + oe-core default) as well.

Can you drop most of do_configure_prepend with this? (Also small typo in
commit message 'currenrly' and 'wtong')

On Sat, May 8, 2021 at 7:49 AM Khem Raj <raj.khem@gmail.com> wrote:

> This ensures that WORDSIZE is as per the target, currenrly this does not
> get it right for cross compiling, and OE uses multilib headers by
> default which means if WORDSIZE is wrong it will go on to include wtong
> headers due to these artificial stubs
>
> Fixes
> swig -python -py3
> -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include
> -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include-fixed
> -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/lib/aarch64-oe-linux/11.1.0/include
> -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include
> -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include
> -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/python3.9
> -I/usr/include/openssl -includeall -modern -builtin -outdir
> TOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/M2Crypto-0.37.1/M2Crypto
> -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i
>
> TOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/openssl/opensslconf.h:23:
> Error: Unable to find 'openssl/opensslconf-32.h'
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  .../recipes-devtools/python/python3-m2crypto_0.37.1.bb        | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta-python/recipes-devtools/python/
> python3-m2crypto_0.37.1.bb b/meta-python/recipes-devtools/python/
> python3-m2crypto_0.37.1.bb
> index 896d9d2cc4..305987d4f0 100644
> --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
> +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
> @@ -33,7 +33,9 @@ DISTUTILS_INSTALL_ARGS += "build_ext
> --openssl=${STAGING_EXECPREFIXDIR}"
>
>  SWIG_FEATURES_x86 = "-D__i386__"
>  SWIG_FEATURES_x32 = "-D__ILP32__"
> -SWIG_FEATURES ?= "-D__${HOST_ARCH}__"
> +
> +SWIG_FEATURES ?= "-D__${HOST_ARCH}__
> ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']}"
> +
>  export SWIG_FEATURES
>
>  # Get around a problem with swig, but only if the
> --
> 2.31.1
>
>

[-- Attachment #2: Type: text/html, Size: 3729 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [meta-python][PATCH] python3-m2crypto: Pass correct ABI defines to swig
  2021-05-08  8:26 ` Martin Jansa
@ 2021-05-08 15:58   ` Khem Raj
  0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2021-05-08 15:58 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembedded-devel

On Sat, May 8, 2021 at 1:26 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> Thanks, this works in my setup (qemuarm64 + oe-core default) as well.
>
> Can you drop most of do_configure_prepend with this? (Also small typo in commit message 'currenrly' and 'wtong')
>

Right. I sent a v2, please check that out.

> On Sat, May 8, 2021 at 7:49 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> This ensures that WORDSIZE is as per the target, currenrly this does not
>> get it right for cross compiling, and OE uses multilib headers by
>> default which means if WORDSIZE is wrong it will go on to include wtong
>> headers due to these artificial stubs
>>
>> Fixes
>> swig -python -py3 -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot-native/usr/bin/aarch64-oe-linux/../../lib/aarch64-oe-linux/gcc/aarch64-oe-linux/11.1.0/include-fixed -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/lib/aarch64-oe-linux/11.1.0/include -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include -ITOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/python3.9 -I/usr/include/openssl -includeall -modern -builtin -outdir TOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/M2Crypto-0.37.1/M2Crypto -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i
>>   TOPDIR/tmp-glibc/work/cortexa57-oe-linux/python3-m2crypto/0.37.1-r0/recipe-sysroot/usr/include/openssl/opensslconf.h:23: Error: Unable to find 'openssl/opensslconf-32.h'
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Cc: Martin Jansa <Martin.Jansa@gmail.com>
>> ---
>>  .../recipes-devtools/python/python3-m2crypto_0.37.1.bb        | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
>> index 896d9d2cc4..305987d4f0 100644
>> --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
>> +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb
>> @@ -33,7 +33,9 @@ DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}"
>>
>>  SWIG_FEATURES_x86 = "-D__i386__"
>>  SWIG_FEATURES_x32 = "-D__ILP32__"
>> -SWIG_FEATURES ?= "-D__${HOST_ARCH}__"
>> +
>> +SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']}"
>> +
>>  export SWIG_FEATURES
>>
>>  # Get around a problem with swig, but only if the
>> --
>> 2.31.1
>>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-05-08 15:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-08  5:49 [meta-python][PATCH] python3-m2crypto: Pass correct ABI defines to swig Khem Raj
2021-05-08  8:26 ` Martin Jansa
2021-05-08 15:58   ` Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.