diff options
| author | Andrew V. Jones <andrew.jones@vector.com> | 2020-09-02 18:17:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 12:17:32 -0500 |
| commit | 254c0391d9186221bc3b8c63687cc30a06b14f1b (patch) | |
| tree | fd5ffbb52c563c79f0a433ee59e9f3deb31c6647 /contrib/get-glpk-cut-log | |
| parent | dd912a03113bbc5ad93260babba061362b660acd (diff) | |
Migrating from using the 'glpk-cut-log' repo to using an official GPLK release + a set of patches (#4775)
This PR attempts to migrate from @timothy-king's repo for glpk-cut-log to using a set of patches against the official release that 'glpk-cut-log' was based off of (4.52).
This is in preparation of trying to rework these patches to be against the latest GPLK release (4.65). If we can do this, then it makes it easier for CVC4's dependancy on GPLK to be able to follow upstream (rather than being stuck on a release that is 6.5 years old!).
I have added GPLK as an option for CI, but I do not know if we actually want this. My concern with adding this to CI is that we're then not testing non-GPL builds, which doesn't seem ideal.
However, before starting to rework the patches to be against 4.65, I want to make sure that things are actually working/stable against 4.52; so having at least one CI target that does use GPLK would be great.
Signed-off-by: Andrew V. Jones andrew.jones@vector.com
Diffstat (limited to 'contrib/get-glpk-cut-log')
| -rwxr-xr-x | contrib/get-glpk-cut-log | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/contrib/get-glpk-cut-log b/contrib/get-glpk-cut-log index 16acf97ae..951e10620 100755 --- a/contrib/get-glpk-cut-log +++ b/contrib/get-glpk-cut-log @@ -2,15 +2,24 @@ # source "$(dirname "$0")/get-script-header.sh" +# get the full path to the contrib dir; needs to be the full path so we can +# refer the patch from within the 'glpk-cut-log' build directory +contrib_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd -P)" + +# Get the full path the patch we wish to apply +patch_file=${contrib_dir}/glpk-cut-log.patch + GLPK_DIR="$DEPS_DIR/glpk-cut-log" -commit=b420454e732f4b3d229c552ef7cd46fec75fe65c +version="4.52" check_dep_dir "$GLPK_DIR" setup_dep \ - "https://github.com/timothy-king/glpk-cut-log/archive/$commit.tar.gz" \ + "https://ftp.gnu.org/gnu/glpk/glpk-${version}.tar.gz" \ "$GLPK_DIR" cd "$GLPK_DIR" +patch -p1 < ${patch_file} + libtoolize aclocal autoheader |