From 410c310269fe89ba849d6599f876a5dc96f7eeee Mon Sep 17 00:00:00 2001 From: Jerry James Date: Feb 22 2015 03:11:11 +0000 Subject: Add -arm patch to fix build failure on arm builders due to inverted test. --- diff --git a/python-theano-arm.patch b/python-theano-arm.patch new file mode 100644 index 0000000..0a6420e --- /dev/null +++ b/python-theano-arm.patch @@ -0,0 +1,11 @@ +--- ./theano/gof/cmodule.py.orig 2014-03-12 20:00:00.000000000 -0600 ++++ ./theano/gof/cmodule.py 2015-02-21 20:05:04.130272458 -0700 +@@ -1723,7 +1723,7 @@ class GCC_compiler(object): + # or 64 bit and compile accordingly. This step is ignored for ARM + # architectures in order to make Theano compatible with the Raspberry + # Pi. +- if any([not 'arm' in flag for flag in cxxflags]): ++ if all([not 'arm' in flag for flag in cxxflags]): + n_bits = local_bitwidth() + cxxflags.append('-m%d' % n_bits) + _logger.debug("Compiling for %s bit architecture", n_bits) diff --git a/python-theano.spec b/python-theano.spec index 369ef8f..426aa17 100644 --- a/python-theano.spec +++ b/python-theano.spec @@ -3,7 +3,7 @@ Name: python-theano Version: 0.6.0 -Release: 4%{?rctag:.%{rctag}}%{?dist} +Release: 5%{?rctag:.%{rctag}}%{?dist} Summary: Mathematical expressions involving multidimensional arrays License: BSD @@ -22,6 +22,8 @@ Source4: badge2.png Patch0: %{name}-doc.patch # Unbundle python-six Patch1: %{name}-six.patch +# Fix a build failure on arm due to an inverted test +Patch2: %{name}-arm.patch BuildArch: noarch @@ -97,6 +99,7 @@ efficiently. Theano features: %setup -q -n %{pkgname}-%{version}%{?rctag:.%{rctag}} -T -D -a 1 %patch0 %patch1 +%patch2 # Don't use non-local images when building documentation cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} doc/images @@ -190,6 +193,9 @@ chmod a+x $(find %{buildroot} -name \*.py -o -name \*.sh | xargs grep -l '^#!') %{python3_sitelib}/* %changelog +* Sat Feb 21 2015 Jerry James - 0.6.0-5 +- Add -arm patch to fix build failure on arm builders due to inverted test + * Sat Feb 21 2015 Jerry James - 0.6.0-4 - Drop workaround for fixed bug (bz 1075826) - Use license macro