From patchwork Fri Sep 22 22:30:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 817731 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xzSqz2t9bz9s7v for ; Sat, 23 Sep 2017 08:31:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 566A388D59; Fri, 22 Sep 2017 22:31:08 +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 KzfKuYb3wRBv; Fri, 22 Sep 2017 22:31:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7762988D62; Fri, 22 Sep 2017 22:31:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3F6C71C26CB for ; Fri, 22 Sep 2017 22:31:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 37A8489B51 for ; Fri, 22 Sep 2017 22:31:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tKrTnnxAkJiJ for ; Fri, 22 Sep 2017 22:31:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtprelay.synopsys.com (us01smtprelay-2.synopsys.com [198.182.60.111]) by whitealder.osuosl.org (Postfix) with ESMTPS id 22EDF89B0B for ; Fri, 22 Sep 2017 22:31:04 +0000 (UTC) Received: from mailhost.synopsys.com (mailhost2.synopsys.com [10.13.184.66]) by smtprelay.synopsys.com (Postfix) with ESMTP id 385D110C1286; Fri, 22 Sep 2017 15:31:03 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 248A726F; Fri, 22 Sep 2017 15:31:03 -0700 (PDT) Received: from ru20arcgnu1.internal.synopsys.com (ru20arcgnu1.internal.synopsys.com [10.121.9.48]) by mailhost.synopsys.com (Postfix) with ESMTP id C4F6A249; Fri, 22 Sep 2017 15:31:00 -0700 (PDT) From: Alexey Brodkin To: buildroot@busybox.net Date: Sat, 23 Sep 2017 01:30:53 +0300 Message-Id: <20170922223053.25433-1-abrodkin@synopsys.com> X-Mailer: git-send-email 2.11.0 Cc: Thomas Petazzoni , Alexey Brodkin , Gwenhael Goavec-Merou , Rahul Bedarkar Subject: [Buildroot] [PATCH] python-numpy: Ensure `_npy_scaled_cexp{, f, l}` is defined when needed X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" With update of Numpy to the latest version we've got one change which breaks Numpy compilcation in some cases. This change back-ports upstream fix from: https://github.com/numpy/numpy/pull/9740 Signed-off-by: Alexey Brodkin Cc: Rahul Bedarkar Cc: Gwenhael Goavec-Merou Cc: Arnout Vandecappelle Cc: Peter Korsgaard --- Note it supersedes http://patchwork.ozlabs.org/patch/816381/. ..._npy_scaled_cexp-f-l-is-defined-when-need.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch diff --git a/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch b/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch new file mode 100644 index 0000000000..a243df544e --- /dev/null +++ b/package/python-numpy/0003-BUG-Ensure-_npy_scaled_cexp-f-l-is-defined-when-need.patch @@ -0,0 +1,43 @@ +From 9aa5d577c58f04f9606674dd6f326aee1bf1e6e8 Mon Sep 17 00:00:00 2001 +From: Charles Harris +Date: Thu, 21 Sep 2017 10:10:05 -0600 +Subject: [PATCH] BUG: Ensure `_npy_scaled_cexp{,f,l}` is defined when needed. + +The `_npy_scaled_cexp{,f,l}` functions were previously only defined when +the npy_cexp fallback functions were needed, but they are also called by +the npy_csinh and npy_ccosh functions. + +Signed-off-by: Alexey Brodkin +--- + numpy/core/src/npymath/npy_math_complex.c.src | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/numpy/core/src/npymath/npy_math_complex.c.src b/numpy/core/src/npymath/npy_math_complex.c.src +index a82a6737c..fb31e8e6a 100644 +--- a/numpy/core/src/npymath/npy_math_complex.c.src ++++ b/numpy/core/src/npymath/npy_math_complex.c.src +@@ -184,7 +184,9 @@ npy_carg@c@(@ctype@ z) + #define SCALED_CEXP_LOWERL 11357.216553474703895L + #define SCALED_CEXP_UPPERL 22756.021937783004509L + +-#ifndef HAVE_CEXP@C@ ++#if !defined(HAVE_CSINH@C@) || \ ++ !defined(HAVE_CCOSH@C@) || \ ++ !defined(HAVE_CEXP@C@) + + static + @ctype@ +@@ -212,6 +214,10 @@ _npy_scaled_cexp@c@(@type@ x, @type@ y, npy_int expt) + npy_ldexp@c@(mant * mantsin, expt + exsin)); + } + ++#endif ++ ++#ifndef HAVE_CEXP@C@ ++ + @ctype@ + npy_cexp@c@(@ctype@ z) + { +-- +2.11.0 +