Drop autotools from being a macOS requirement (#2715)

ktf · web-flow · commit c62cde50d964 · 2021-01-07T16:01:36.000+01:00
Nowadays macOS / ubuntu ship with a modern enough version of autotools
which is actually able to compile everything. Keeping our own copy
only for ancient architectures.
diff --git a/agile.sh b/agile.sh
@@ -9,7 +9,7 @@ requires:
   - HepMC
   - Python-modules
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - SWIG
 ---
 #!/bin/bash -e
diff --git a/apmon-cpp.sh b/apmon-cpp.sh
@@ -4,7 +4,7 @@ tag: v2.2.8-alice5
 source: https://github.com/alisw/apmon-cpp.git
 build_requires:
  - "libtirpc:(?!osx)"
- - autotools
+ - "autotools:(slc6|slc7)"
  - "GCC-Toolchain:(?!osx)"
 ---
 #!/bin/bash -e
diff --git a/defaults-jalien.sh b/defaults-jalien.sh
@@ -14,7 +14,7 @@ overrides:
   AliPhysics:
     version: "%(tag_basename)s_JALIEN"
     tag: v5-09-56-01
-  autotools:
+  "autotools:(slc6|slc7)":
     version: "%(tag_basename)s_JALIEN"
     tag: v1.5.0
 ---
diff --git a/freetype.sh b/freetype.sh
@@ -3,7 +3,7 @@ version: v2.10.1
 requires:
  - AliEn-Runtime:(?!.*ppc64)
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - system-curl
 prefer_system: (?!slc5)
 prefer_system_check: |
diff --git a/gcc-toolchain.sh b/gcc-toolchain.sh
@@ -5,7 +5,7 @@ source: https://github.com/alisw/gcc-toolchain
 prepend_path:
   "LD_LIBRARY_PATH": "$GCC_TOOLCHAIN_ROOT/lib64"
 build_requires:
- - autotools
+ - "autotools:(slc6|slc7)"
  - yacc-like
  - make
 prefer_system: .*
diff --git a/glog.sh b/glog.sh
@@ -2,7 +2,7 @@ package: glog
 version: v0.3.4
 source: https://github.com/google/glog
 build_requires:
- - autotools
+ - "autotools:(slc6|slc7)"
  - "GCC-Toolchain:(?!osx)"
 --- 
 rsync -av --delete --exclude="**/.git" $SOURCEDIR/ .
diff --git a/gsl.sh b/gsl.sh
@@ -5,7 +5,7 @@ source: https://github.com/alisw/gsl
 requires:
   - "GCC-Toolchain:(?!osx)"
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - alibuild-recipe-tools
 prefer_system: (?!slc5)
 prefer_system_check: |
diff --git a/herwig.sh b/herwig.sh
@@ -11,7 +11,7 @@ requires:
   - Openloops
   - madgraph
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - alibuild-recipe-tools
 ---
 #!/bin/bash -e
diff --git a/jemalloc.sh b/jemalloc.sh
@@ -4,7 +4,7 @@ tag: 5.1.0
 source: https://github.com/jemalloc/jemalloc
 build_requires:
  - "GCC-Toolchain:(?!osx)"
- - autotools
+ - "autotools:(slc6|slc7)"
 ---
 #!/bin/bash -e
 rsync -a --delete --exclude "**/.git" $SOURCEDIR/ .
diff --git a/jq.sh b/jq.sh
@@ -6,7 +6,7 @@ requires:
   - "GCC-Toolchain:(?!osx)"
 build_requires:
   - oniguruma
-  - autotools
+  - "autotools:(slc6|slc7)"
 prefer_system: (?!slc5.*)
 prefer_system_check: |
   type jqfoo
diff --git a/json-c.sh b/json-c.sh
@@ -3,7 +3,7 @@ version: "v0.13.1"
 tag: "json-c-0.13.1-20180305"
 source: https://github.com/json-c/json-c
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - "GCC-Toolchain:(?!osx)"
 ---
 #!/bin/bash -e
diff --git a/lhapdf.sh b/lhapdf.sh
@@ -7,7 +7,7 @@ requires:
  - "Python-system:(?!slc.*)"
  - "GCC-Toolchain:(?!osx)"
 build_requires:
- - autotools
+ - "autotools:(slc6|slc7)"
 env:
   PYTHONPATH: $LHAPDF_ROOT/lib/python/site-packages
 ---
diff --git a/libatomic_ops.sh b/libatomic_ops.sh
@@ -3,7 +3,7 @@ version: libatomic_ops-7_4_2
 source: https://github.com/ivmai/libatomic_ops/
 tag: master
 build_requires:
-  - autotools:(slc[56].*|ubt.*)
+  - "autotools:(slc6|slc7)"
 ---
 #!/bin/sh
 rsync -a $SOURCEDIR/ ./
diff --git a/libffi.sh b/libffi.sh
@@ -1,7 +1,7 @@
 package: libffi
 version: v3.2.1
 build_requires:
- - autotools
+ - "autotools:(slc6|slc7)"
 source: https://github.com/libffi/libffi
 prepend_path:
   LD_LIBRARY_PATH: "$LIBFFI_ROOT/lib64"
diff --git a/libtirpc.sh b/libtirpc.sh
@@ -3,7 +3,7 @@ version: "%(tag_basename)s"
 tag: "libtirpc-1-1-4"
 source: https://github.com/alisw/libtirpc
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - "GCC-Toolchain:(?!osx)"
 ---
 #!/bin/bash -e
diff --git a/libxml2.sh b/libxml2.sh
@@ -2,7 +2,7 @@ package: libxml2
 version: "%(tag_basename)s"
 tag: v2.9.3
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - zlib
   - "GCC-Toolchain:(?!osx)"
 source: https://github.com/alisw/libxml2.git
diff --git a/lzma.sh b/lzma.sh
@@ -3,7 +3,7 @@ version: "%(tag_basename)s"
 tag: "v5.2.3"
 source: https://github.com/alisw/liblzma
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - "GCC-Toolchain:(?!osx)"
   - rsync
 prefer_system: "(?!slc5)"
diff --git a/mesos.sh b/mesos.sh
@@ -3,7 +3,7 @@ version: v0.28.2
 tag: 0.28.2
 source: https://git-wip-us.apache.org/repos/asf/mesos.git
 build_requires:
-- autotools
+- "autotools:(slc6|slc7)"
 - protobuf
 - glog
 - Python-modules
diff --git a/mpfr.sh b/mpfr.sh
@@ -3,7 +3,7 @@ version: v3.1.3
 tag: v3.1.3
 source: https://github.com/alisw/MPFR.git
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - GMP
 ---
 #!/bin/sh
diff --git a/ofi.sh b/ofi.sh
@@ -3,7 +3,7 @@ version: "%(tag_basename)s"
 tag: "v1.7.1"
 source: https://github.com/ofiwg/libfabric
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
 prefer_system: ".*"
 prefer_system_check: |
   pkg-config --atleast-version=1.6.0 libfabric 2>&1 && printf "#include \"rdma/fabric.h\"\nint main(){}" | c++ -xc - -o /dev/null
diff --git a/oniguruma.sh b/oniguruma.sh
@@ -5,7 +5,7 @@ source: https://github.com/kkos/oniguruma/
 requires:
   - "GCC-Toolchain:(?!osx)"
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
 prefer_system: (?!slc5.*)
 ---
 #!/bin/sh
diff --git a/pda.sh b/pda.sh
@@ -6,7 +6,7 @@ requires:
   - "GCC-Toolchain:(?!osx)"
 build_requires:
   - kernel-devel
-  - autotools
+  - "autotools:(slc6|slc7)"
 
 --- 
 #!/bin/sh
diff --git a/sacrifice.sh b/sacrifice.sh
@@ -10,7 +10,7 @@ requires:
   - Python-modules
   - pythia
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
 ---
 #!/bin/bash -e
 
diff --git a/sherpa.sh b/sherpa.sh
@@ -11,7 +11,7 @@ requires:
   - pythia
 build_requires:
   - system-curl
-  - autotools
+  - "autotools:(slc6|slc7)"
   - cgal
   - GMP
   - alibuild-recipe-tools
diff --git a/sodium.sh b/sodium.sh
@@ -3,7 +3,7 @@ version: v1.0.8
 tag: 1.0.8
 source: https://github.com/jedisct1/libsodium
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - "GCC-Toolchain:(?!osx)"
 ---
 #!/bin/sh
diff --git a/sqlite.sh b/sqlite.sh
@@ -8,7 +8,7 @@ prefer_system_check: |
   if [ $? -ne 0 ]; then printf "SQLite not found.\n * On RHEL-compatible systems you probably need: sqlite sqlite-devel\n * On Ubuntu-compatible systems you probably need: libsqlite3-0 libsqlite3-dev\n"; exit 1; fi
 build_requires:
   - system-curl
-  - autotools
+  - "autotools:(slc6|slc7)"
 ---
 #!/bin/bash -ex
 rsync -av $SOURCEDIR/ ./
diff --git a/swig.sh b/swig.sh
@@ -3,7 +3,7 @@ version: 3.0.12
 tag: rel-3.0.12
 source: https://github.com/swig/swig
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - "GCC-Toolchain:(?!osx)"
   - yacc-like
 env:
diff --git a/thepeg.sh b/thepeg.sh
@@ -8,7 +8,7 @@ requires:
   - HepMC
   - boost
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - GMP
 prepend_path:
   LD_LIBRARY_PATH: "$THEPEG_ROOT/lib/ThePEG"
diff --git a/uuid.sh b/uuid.sh
@@ -4,7 +4,7 @@ tag: alice/v2.27.1
 source: https://github.com/alisw/uuid
 build_requires:
  - "GCC-Toolchain:(?!osx)"
- - autotools
+ - "autotools:(slc6|slc7)"
 ---
 rsync -av --delete --exclude "**/.git" $SOURCEDIR/ .
 if [[ $AUTOTOOLS_ROOT == "" ]]  && which brew >/dev/null; then
diff --git a/xalienfs.sh b/xalienfs.sh
@@ -8,7 +8,7 @@ requires:
  - "osx-system-openssl:(osx.*)"
  - AliEn-Runtime
 build_requires:
- - autotools
+ - "autotools:(slc6|slc7)"
  - SWIG
  - UUID
  - libperl
diff --git a/yoda.sh b/yoda.sh
@@ -7,7 +7,7 @@ requires:
   - "Python:slc.*"
   - "Python-system:(?!slc.*)"
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
 prepend_path:
   PYTHONPATH: $YODA_ROOT/lib64/python2.7/site-packages:$YODA_ROOT/lib/python2.7/site-packages
 ---
diff --git a/zeromq.sh b/zeromq.sh
@@ -4,7 +4,7 @@ source: https://github.com/zeromq/libzmq
 requires:
   - "GCC-Toolchain:(?!osx)"
 build_requires:
-  - autotools
+  - "autotools:(slc6|slc7)"
   - alibuild-recipe-tools
 prefer_system: (?!slc5.*)
 prefer_system_check: |
