From 57d3b6d5ecd82eea145141f6997849108427f3ef Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Jan 24 2020 13:08:06 +0000 Subject: Add patches corresponding to upstream from 2020000.1 -> 20200000.2 --- diff --git a/cppad.spec b/cppad.spec index e5012c7..0efd785 100644 --- a/cppad.spec +++ b/cppad.spec @@ -16,10 +16,6 @@ Version: %{yyyymmdd}.0 Release: 1%{?dist} Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc -# As of yet, there are no object libraries or executables included in this -# package. However, the results of the cmake command depend on the architecture -# so we do not include 'BuildArch: noarch' in this spec file. - # As of yet there is no debug version installed for cppad_lib. # The user can compile with or without debugging using this library, # because CPPAD_DEBUG_AND_RELEASE is defined. @@ -113,7 +109,7 @@ sed -i.bak CppAD-%{version}/test_more/debug_rel/CMakeLists.txt \ sed -i.bak CppAD-%{version}/include/cppad/local/op_code_var.hpp \ -e '/std::numeric_limits::max()/s|^\( *\).*|\1true|' # -# Patch will not be necessary when upsstream sourse is >= 20200000.0 +# Patch will not be necessary when upstream source is >= 20200000.1 cat << EOF > junk.sed /write(fd, char_ptr, char_size);/! b skip s|^ *|&ssize_t flag = | @@ -125,6 +121,26 @@ s|\$|&\\ : skip EOF sed -i.bak CppAD-%{version}/include/cppad/core/check_for_nan.hpp -f junk.sed +# +# Patch will not be necessary when upstream source is >= 20200000.1 +sed -i.bak CppAD-%{version}/CMakeLists.txt \ + -e 's|FILES_MATCHING PATTERN "\*.hpp"|& PATTERN "omh" EXCLUDE|' +# +# Patch will not be necessary when upstream source is >= 20200000.2 +cat << EOF > junk.sed +/Base zero(0)/! b skip +: loop_1 +N +/}/! b loop_1 +/GreaterThanZero/! b skip +d +: skip +EOF +sed -i.bak CppAD-%{version}/include/cppad/local/pow_op.hpp -f junk.sed +# +# Patch will not be necessary when upstream source is >= 20200000.2 +sed -i.bak CppAD-%{version}/test_more/general/pow.cpp \ + -e '/ok *&= PowTestSeven();/d' # ----------------------------------------------------------------------------- # build # ----------------------------------------------------------------------------- @@ -201,6 +217,12 @@ make check # ---------------------------------------------------------------------------- %changelog +* Thu Jan 23 2020 Brad Bell - 20200000.0-2 +- Remove comment about object library becasue install libcppadlib.so +- Patch to not install empty include (in 20200000.1 upstream) +- Patch to not use GreaterThanZero during reverse mode (in 2020000.2) +- Remove PowTestSeven which tested the GreaterThanZeor in reverse mode + * Thu Jan 02 2020 Brad Bell - 20200000.0-1 - Advance to version 2020 of cppad - This is a major change because it we need to install the binary cppad_lib.