From d81f23fc234c346e47c20879bb916e585c5670d8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 Aug 2023 13:47:08 -0700 Subject: python3-m2crypto: Append architecture to SWIG_FEATURES instead of overriding For x86/x32 it was overwriting SWIG_FEATURES, its better to append it like for other arches, in addition it brings essential options to remove buildpaths from .so files. Use OPENSSL_NO_FILENAMES define instead of overrding OPENSSL_FILE for achieving reproducibility. Takes care of line numbers too. Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python3-m2crypto_0.39.0.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-python') diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.39.0.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.39.0.bb index ac62773064..d47ec2bac4 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.39.0.bb +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.39.0.bb @@ -31,15 +31,15 @@ RDEPENDS:${PN} += "\ DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}" DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}" -SWIG_FEATURES:x86 = "-D__i386__" -SWIG_FEATURES:x32 = "-D__ILP32__" - -SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']} -DOPENSSL_FILE='openssl/macros.h'" +SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']} -DOPENSSL_NO_FILENAMES" SWIG_FEATURES:append:riscv64 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" SWIG_FEATURES:append:riscv32 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" SWIG_FEATURES:append:mipsarch = " -D_MIPS_SZPTR=${SITEINFO_BITS}" SWIG_FEATURES:append:powerpc64le = " -D__powerpc64__" +SWIG_FEATURES:append:x86 = " -D__i386__" +SWIG_FEATURES:append:x32 = " -D__ILP32__" + export SWIG_FEATURES export STAGING_DIR -- cgit v1.2.3-54-g00ecf