Skip to content

Commit

Permalink
Release scripts: glpk no longer needed
Browse files Browse the repository at this point in the history
use the vendored one
  • Loading branch information
AltGr committed Feb 5, 2018
1 parent c93e373 commit 934337b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion release/Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM multiarch/debian-debootstrap:%TARGET_TAG%
# docker run --rm --privileged multiarch/qemu-user-static:register --reset
LABEL Description="opam release builds" Vendor="OCamlPro" Version="1.0"

RUN apt-get update && apt-get install bzip2 g++ make patch wget libglpk-dev libltdl-dev --yes && apt-get clean --yes
RUN apt-get update && apt-get install bzip2 g++ make patch wget libltdl-dev --yes && apt-get clean --yes
RUN useradd -U --create-home opam

ADD https://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.2.tar.gz /root/
Expand Down
4 changes: 2 additions & 2 deletions release/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ build/%.image: build/Dockerfile.%
# Actually, this is for debian 8 jessie, and varies wildly
CLINKING_linux = \
-Wl,-Bstatic \
-lunix -lbigarray -lmccs_stubs \
-lunix -lbigarray -lmccs_stubs -lmccs_glpk_stubs \
-lstdc++ \
-Wl,-Bdynamic \
-static-libgcc

CLINKING_darwin = \
-lunix -lbigarray -lmccs_stubs \
-lunix -lbigarray -lmccs_stubs -lmccs_glpk_stubs \
-lstdc++

CLINKING_openbsd = $(CLINKING_darwin)
Expand Down
2 changes: 1 addition & 1 deletion release/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# This script is expected to run on Linux with docker available, and to have two
# remotes "some-osx" and "some-openbsd", with the corresponding OSes, ocaml deps
# and glpk installed
# installed

DIR=$(dirname $0)
cd "$DIR"
Expand Down

0 comments on commit 934337b

Please sign in to comment.