From 344794aaba0f8eb63e4174ec412343f035faef4b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Sun, 27 Apr 2014 10:29:57 +0200 Subject: [PATCH] em.add_to_family is now used in all build scripts --- scripts/Modules.build | 1 + scripts/Python.build | 2 +- scripts/autoconf.build | 1 + scripts/automake.build | 1 + scripts/emacs.build | 1 + scripts/gcc.build | 1 + scripts/gmp.build | 1 + scripts/gnuplot.build | 1 + scripts/hdf5_serial.build | 2 +- scripts/libtool.build | 1 + scripts/lua.build | 1 + scripts/m4.build | 1 + scripts/mpc.build | 1 + scripts/mpfr.build | 1 + 14 files changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/Modules.build b/scripts/Modules.build index 230c89b..3b48b53 100755 --- a/scripts/Modules.build +++ b/scripts/Modules.build @@ -17,4 +17,5 @@ module() { # use system gcc to compile declare -rx CC=gcc +em.add_to_family "core" em.make_all diff --git a/scripts/Python.build b/scripts/Python.build index f53424b..2f9100d 100755 --- a/scripts/Python.build +++ b/scripts/Python.build @@ -9,6 +9,6 @@ function em.configure() { } em.set_build_dependencies "${COMPILER}" -em.set_env +em.add_to_family "core" em.make_all diff --git a/scripts/autoconf.build b/scripts/autoconf.build index f197b9a..2f85a5f 100755 --- a/scripts/autoconf.build +++ b/scripts/autoconf.build @@ -23,6 +23,7 @@ function em.install_doc() { # use system gcc to compile declare -rx CC=gcc +em.add_to_family "core" em.set_build_dependencies "m4" em.make_all diff --git a/scripts/automake.build b/scripts/automake.build index 70caaf7..59a299d 100755 --- a/scripts/automake.build +++ b/scripts/automake.build @@ -23,6 +23,7 @@ function em.install_doc() { # use system gcc to compile declare -rx CC=gcc +em.add_to_family "core" em.set_build_dependencies "m4" "autoconf" em.make_all diff --git a/scripts/emacs.build b/scripts/emacs.build index 0cc9f67..787d166 100755 --- a/scripts/emacs.build +++ b/scripts/emacs.build @@ -28,6 +28,7 @@ function em.configure() { || exit 1 } +em.add_to_family "core" em.set_build_dependencies ${build_dependencies} em.make_all diff --git a/scripts/gcc.build b/scripts/gcc.build index 53d4e1d..da78f47 100755 --- a/scripts/gcc.build +++ b/scripts/gcc.build @@ -26,6 +26,7 @@ function em.install_doc() { # use system gcc to compile declare -rx CC=gcc +em.add_to_family "core" em.set_build_dependencies "gmp" "mpfr" "mpc" em.make_all diff --git a/scripts/gmp.build b/scripts/gmp.build index 989004c..df3f03f 100755 --- a/scripts/gmp.build +++ b/scripts/gmp.build @@ -13,5 +13,6 @@ function em.configure() { declare -rx CC=gcc declare -rx CPP=/usr/bin/cpp +em.add_to_family "core" em.make_all diff --git a/scripts/gnuplot.build b/scripts/gnuplot.build index bbef0dd..46805ab 100755 --- a/scripts/gnuplot.build +++ b/scripts/gnuplot.build @@ -20,5 +20,6 @@ function em.install_doc() { "${DOCDIR}" } +em.add_to_family "core" em.set_build_dependencies "${COMPILER}" em.make_all diff --git a/scripts/hdf5_serial.build b/scripts/hdf5_serial.build index a857dec..7523afa 100755 --- a/scripts/hdf5_serial.build +++ b/scripts/hdf5_serial.build @@ -12,7 +12,7 @@ function em.configure() { || exit 1 } -em.set_family "compiler" +em.add_to_family "compiler" em.set_build_dependencies "${COMPILER}" em.make_all diff --git a/scripts/libtool.build b/scripts/libtool.build index 4dd289f..2bc3abc 100755 --- a/scripts/libtool.build +++ b/scripts/libtool.build @@ -21,6 +21,7 @@ function em.install_doc() { # use system gcc to compile declare -rx CC=gcc +em.add_to_family "core" em.set_build_dependencies "autoconf" "automake" em.make_all diff --git a/scripts/lua.build b/scripts/lua.build index 2126956..0109bff 100755 --- a/scripts/lua.build +++ b/scripts/lua.build @@ -15,5 +15,6 @@ function em.build() { make } +em.add_to_family "core" em.set_build_dependencies "${COMPILER}" em.make_all diff --git a/scripts/m4.build b/scripts/m4.build index 634070b..9a07187 100755 --- a/scripts/m4.build +++ b/scripts/m4.build @@ -11,4 +11,5 @@ function em.configure() { # use system gcc to compile declare -rx CC=gcc +em.add_to_family "core" em.make_all diff --git a/scripts/mpc.build b/scripts/mpc.build index 7f164ac..73cc892 100755 --- a/scripts/mpc.build +++ b/scripts/mpc.build @@ -14,6 +14,7 @@ function em.configure() { # use system gcc to compile declare -rx CC=gcc +em.add_to_family "core" em.set_build_dependencies "gmp" "mpfr" em.make_all diff --git a/scripts/mpfr.build b/scripts/mpfr.build index b58606f..ba7cf06 100755 --- a/scripts/mpfr.build +++ b/scripts/mpfr.build @@ -13,5 +13,6 @@ function em.configure() { # use system gcc to compile declare -rx CC=gcc +em.add_to_family "core" em.set_build_dependencies "gmp" em.make_all