From 2c003e2712e1ad2405a7cb924d0cbb946b4d638d Mon Sep 17 00:00:00 2001 From: Paulo Andrade Date: Jan 28 2015 21:15:51 +0000 Subject: Correct check on bigendian. --- diff --git a/mp-endian.patch b/mp-endian.patch new file mode 100644 index 0000000..8a1e990 --- /dev/null +++ b/mp-endian.patch @@ -0,0 +1,12 @@ +diff -up mp-35060ba2a59f2b0f0fd622ed9df678f142f846ed/test/util.cc.orig mp-35060ba2a59f2b0f0fd622ed9df678f142f846ed/test/util.cc +--- mp-35060ba2a59f2b0f0fd622ed9df678f142f846ed/test/util.cc.orig 2015-01-28 19:00:00.500079394 -0200 ++++ mp-35060ba2a59f2b0f0fd622ed9df678f142f846ed/test/util.cc 2015-01-28 19:00:29.792054998 -0200 +@@ -155,7 +155,7 @@ mp::NLHeader MakeTestHeader() { + + h.num_linear_net_vars = 103; + h.num_funcs = 107; +- h.arith_kind = mp::arith::IEEE_LITTLE_ENDIAN; ++ h.arith_kind = mp::arith::GetKind(); + h.flags = 109; + + h.num_linear_binary_vars = 113; diff --git a/mp.spec b/mp.spec index ce4f82b..7da6818 100644 --- a/mp.spec +++ b/mp.spec @@ -27,10 +27,12 @@ BuildRequires: git BuildRequires: gsl-devel BuildRequires: doxygen BuildRequires: python-sphinx -BuildRequires: python-sphinx-latex +#BuildRequires: python-sphinx-latex BuildRequires: unixODBC-devel # https://github.com/ampl/mp/issues/25 Patch0: %{name}-fpinit.patch +# https://github.com/ampl/mp/commit/0b53c90a9bc823463ae6b818ba5798c175b69540 +Patch1: %{name}-endian.patch %description An open-source library for mathematical programming. @@ -75,6 +77,7 @@ for %{name}. ln -s %{_javadir}/jacop/jacop.jar thirdparty/jacop/jacop-`rpm -q --qf "%%{VERSION}" jacop`.jar %endif %patch0 -p1 +%patch1 -p1 %build mkdir build @@ -140,6 +143,7 @@ make -C build test * Wed Jan 28 2015 pcpa - 1.3.0-3 - Enable the jacop interface. - Use a better patch for non x86 fpinit (#1186162) +- Correct check on bigendian. * Fri Jan 23 2015 pcpa - 1.3.0-2 - Use the license macro for the LICENSE.rst file (#1181793#c3)