# HG changeset patch # User wenzelm # Date 1455204578 -3600 # Node ID 707f9b182f4fb4c02048e910f3bac7197971d4e3 # Parent d9cfe5c3815d6692690fb4f0c3904adc3e78063d evade a potential conflict of /bin/bash versus /bin/sh -> dash (notably on Ubuntu and Debian) -- note that execvpe does not exist on old glibc on Ubuntu 10.04 LTS, but the environ should be unchanged; diff -r d9cfe5c3815d -r 707f9b182f4f Admin/components/components.sha1 --- a/Admin/components/components.sha1 Wed Feb 10 14:40:15 2016 +0100 +++ b/Admin/components/components.sha1 Thu Feb 11 16:29:38 2016 +0100 @@ -112,6 +112,7 @@ b4b624fb5f34d1dc814fb4fb469fafd7d7ea018a polyml-5.5.3-20150908.tar.gz b668e1f43a41608a8eb365c5e19db6c54c72748a polyml-5.5.3-20150911.tar.gz 1f5cd9b1390dab13861f90dfc06d4180cc107587 polyml-5.5.3-20150916.tar.gz +f78896e588e8ebb4da57bf0c95210b0f0fa9e551 polyml-5.6-1.tar.gz 03ba81e595fa6d6df069532d67ad3195c37d9046 polyml-5.6-20151123.tar.gz 822f489c18e38ce5ef979ec21dccce4473e09be6 polyml-5.6-20151206.tar.gz bd6a448f0e0d5787747f4f30ca661f9c1868e4a7 polyml-5.6-20151223.tar.gz diff -r d9cfe5c3815d -r 707f9b182f4f Admin/components/main --- a/Admin/components/main Wed Feb 10 14:40:15 2016 +0100 +++ b/Admin/components/main Thu Feb 11 16:29:38 2016 +0100 @@ -10,7 +10,7 @@ jfreechart-1.0.14-1 jortho-1.0-2 kodkodi-1.5.2 -polyml-5.6 +polyml-5.6-1 scala-2.11.7 spass-3.8ds xz-java-1.2-1 diff -r d9cfe5c3815d -r 707f9b182f4f Admin/polyml/README --- a/Admin/polyml/README Wed Feb 10 14:40:15 2016 +0100 +++ b/Admin/polyml/README Thu Feb 11 16:29:38 2016 +0100 @@ -4,6 +4,17 @@ This compilation of Poly/ML 5.6 (http://www.polyml.org) is based on the source distribution from https://github.com/polyml/polyml/releases/tag/v5.6/. +On Linux the sources have changed as follows, in order to evade a +potential conflict of /bin/bash versus /bin/sh -> dash (notably on +Ubuntu and Debian): + +diff -r src-orig/libpolyml/process_env.cpp src/libpolyml/process_env.cpp +228c228 +< execve("/bin/sh", argv, environ); +--- +> execvp("bash", argv); + + The included build script is used like this: ./build src x86-linux --with-gmp @@ -18,4 +29,4 @@ Makarius - 31-Jan-2016 + 11-Feb-2016