diff options
| author | Tobias Bachmann | 2019-09-30 12:57:12 +0200 |
|---|---|---|
| committer | Tobias Bachmann | 2019-09-30 12:57:12 +0200 |
| commit | 1ea38b87709103279d046db5fd935d6343b75245 (patch) | |
| tree | 7a3cac8e71371b288935fb3661891859ddeed6cc /001-use_distribution_environment.patch | |
| parent | f7b84771b9a8e017036f521781a82e75c3124bf6 (diff) | |
| download | aur-1ea38b87709103279d046db5fd935d6343b75245.tar.gz | |
FSL 6.0.2
Diffstat (limited to '001-use_distribution_environment.patch')
| -rw-r--r-- | 001-use_distribution_environment.patch | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/001-use_distribution_environment.patch b/001-use_distribution_environment.patch index a42a432527ba..2461d225f84f 100644 --- a/001-use_distribution_environment.patch +++ b/001-use_distribution_environment.patch @@ -37,30 +37,26 @@ export FSLTCLSH FSLWISH ---- a/fsl/extras/build 2016-11-15 15:30:21.000000000 +0100 -+++ b/fsl/extras/build 2018-11-25 14:10:48.382885194 +0100 -@@ -96,21 +96,20 @@ - BUILDICONV=1 +--- a/fsl/extras/build 2019-09-29 14:50:57.966635464 +0200 ++++ b/fsl/extras/build 2019-09-29 14:53:48.906589517 +0200 +@@ -96,21 +96,12 @@ + BUILDICONV=1 fi fi -PROJECTS="tcl tk" -+PROJECTS="" - if [ ${BUILDZLIB} -eq 1 ]; then +-if [ ${BUILDZLIB} -eq 1 ]; then - PROJECTS="${PROJECTS} zlib" -+ PROJECTS="${PROJECTS}" - fi +-fi -PROJECTS="${PROJECTS} libpng" -+PROJECTS="${PROJECTS}" - if [ ${BUILDICONV} -eq 1 ]; then +-if [ ${BUILDICONV} -eq 1 ]; then - PROJECTS="${PROJECTS} libiconv" -+ PROJECTS="${PROJECTS}" - fi +-fi -PROJECTS="${PROJECTS} libgd libgdc libprob libcprob newmat cprob newran fftw" --PROJECTS="${PROJECTS} boost libxml2-2.9.2 libxml++-2.34.0 libsqlite libnlopt ../include/armawrap/dummy_newmat" +-PROJECTS="${PROJECTS} boost libxml2-2.9.2 libxmlpp libsqlite libnlopt ../include/armawrap/dummy_newmat" +PROJECTS="${PROJECTS} libgdc libprob libcprob cprob newran ../include/armawrap/dummy_newmat" for projname in $PROJECTS; do if [ -d $FSLESRCDIR/$projname ] ; then - buildIt $FSLESRCDIR $projname 1 + buildIt $FSLESRCDIR $projname 1 elif [ "$projname" = "boost" -a -d ${FSLEXTINC}/boost/boost ]; then - buildIt $FSLEXTINC boost 0 + buildIt $FSLEXTINC 0 |