From patchwork Sun Nov 8 17:28:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1396352 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=MBmtXfDG; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CTh2C1qj2z9sSf for ; Mon, 9 Nov 2020 04:29:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0C8A885BAE; Sun, 8 Nov 2020 17:29:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EdYb8Cnw2rMO; Sun, 8 Nov 2020 17:29:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3287C85C5C; Sun, 8 Nov 2020 17:29:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6FF681BF479 for ; Sun, 8 Nov 2020 17:29:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5FC92203FF for ; Sun, 8 Nov 2020 17:29:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AE74u6A-mvfh for ; Sun, 8 Nov 2020 17:29:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by silver.osuosl.org (Postfix) with ESMTPS id C111820336 for ; Sun, 8 Nov 2020 17:29:17 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id c16so5864456wmd.2 for ; Sun, 08 Nov 2020 09:29:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MWnQySgGO8uHLeGdytpKJur9oKeToapkF1cILrsAmd8=; b=MBmtXfDGfkII9vp9WYLiSTGWit+JeQsDqmS1S1AK+Qaatsf7ZwSsvjhQfOdwcVbIIt D0OAYKk5ypIr796DNnvrJeZJLlOPXYGxhRQ8ZPJMH8RDBK2KEBV5wSH340ZXYgZozi37 8/YCOlXeFPqYPI0xiTsyxy3KaKwxacmesNyRkh8BSTBbF5t+3ojquYsopiWvI7uLNEm1 t+VyFHTYNE7i4MH6YnQ60IVcY4V3Vfu4fn4udOYAJG3oh3WFN/uxuWxpSWOBl0QhypWx 2xb6pnGEB0BN8/SoRD0J2rsQgW9cSsC7Yn9xyyH1krBYvmdKvxikDLNO8B2eFWklV1Kq a6vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MWnQySgGO8uHLeGdytpKJur9oKeToapkF1cILrsAmd8=; b=sFgpZQeVuN+yAWbxuFNBWd+5MHG8mUPby82FG/tuUcoMwSQtAvO2qtqh8tVqizSk6e E5FVCt06sOJP9526LLQXxi/41R6gQHHPioIGPvbcnYnBIvcLLT+vcEGKfBOmkhrJeScp Z7LbVGDm4aEUkhRkn7Ts++eBEpVRwXmrmUq/aXmE+VQq3xgZBuZzf/rB2TF3PFrmSGVQ vP6dFKELdMVy+t4CzSyTiIbYIYr4mcumViuS87GfCPBE7CKznSixqfOzq8VzjKwx0dhq sn8fVoFn45yafuxN/6OMa+vVnxXD7LTL6mdJGsRPXDhp3zoZ+PtwGi57RKZL68uIjdDZ pN8A== X-Gm-Message-State: AOAM531rB1m0+F2m6qXQ+gI1iKR+pJnpsosfVhnoOPDUExrZlNkd01rX y5kMuUr9bU+edAyiW8MUoMp8ciChUb0= X-Google-Smtp-Source: ABdhPJwoXlOnVD792ySaHYTauR0O6Tf9DbytYE7cNWLvn0w0Apzrw0oTJaa7g0IX+oI3MpDApZhiTA== X-Received: by 2002:a1c:6a0d:: with SMTP id f13mr10359602wmc.172.1604856555775; Sun, 08 Nov 2020 09:29:15 -0800 (PST) Received: from kali.home (lfbn-ren-1-924-126.w83-197.abo.wanadoo.fr. [83.197.238.126]) by smtp.gmail.com with ESMTPSA id v9sm10279439wrp.11.2020.11.08.09.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 09:29:15 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 8 Nov 2020 18:28:22 +0100 Message-Id: <20201108172822.63987-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/python-m2crypto: fix build on arm and mips X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gustavo Heinz , Fabrice Fontaine , Asaf Kahlon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fix build failure on arm and mips (perhaps also other) Fixes: - http://autobuild.buildroot.org/results/7f63e6a2d8681cc3408f344556afd5dd16eb7368 - http://autobuild.buildroot.org/results/d115a082418321e7dc4715c635f94b30b3cad387 Signed-off-by: Fabrice Fontaine --- ...swig-default-includes-before-openssl.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch + diff --git a/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch b/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch new file mode 100644 index 0000000000..57fbd0126c --- /dev/null +++ b/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch @@ -0,0 +1,53 @@ +From 1aab31787a8d1ef9436d9cf81832691f729b6282 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 7 Nov 2020 23:26:30 +0100 +Subject: [PATCH] setup.py: move swig default includes before openssl + +Move swig default includes before openssl to avoid the following build +failure when cross-compiling for some architectures (e.g. arm, mips): + +swig -python -py3 -D__x86_64__ -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/python3.9 -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/openssl -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/include -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/include-fixed -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/../../../../mipsel-buildroot-linux-gnu/include -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include -includeall -modern -builtin -outdir /srv/storage/autobuild/run/instance-0/output-1/build/python-m2crypto-0 .36.0/M2Crypto -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i +Deprecated command line option: -modern. This option is now always on. +/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/bits/types.h:139: Error: CPP #error "". Use the -cpperraswarn option to continue swig processing. + +This build failure is probably raised because swig includes a wrong types.h file +from the openssl directory (e.g. +/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include) + +Fixes: + - http://autobuild.buildroot.org/results/7f63e6a2d8681cc3408f344556afd5dd16eb7368 + - http://autobuild.buildroot.org/results/d115a082418321e7dc4715c635f94b30b3cad387 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.com/m2crypto/m2crypto/-/merge_requests/248] +--- + setup.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 89d03bb..0045fda 100644 +--- a/setup.py ++++ b/setup.py +@@ -154,6 +154,9 @@ class _M2CryptoBuildExt(build_ext.build_ext): + if sys.version_info[:1] >= (3,): + self.swig_opts.append('-py3') + ++ # swig seems to need the default header file directories ++ self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) ++ + log.debug('self.include_dirs = %s', self.include_dirs) + log.debug('self.library_dirs = %s', self.library_dirs) + +@@ -204,8 +207,6 @@ class _M2CryptoBuildExt(build_ext.build_ext): + self.swig_opts.append( + '-I' + os.path.join(openssl_include_dir, 'openssl')) + +- # swig seems to need the default header file directories +- self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) + self.swig_opts.append('-includeall') + self.swig_opts.append('-modern') + self.swig_opts.append('-builtin') +-- +2.28.0