diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-27 20:41:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-27 20:41:28 +0300 |
| commit | 54a27ef444fe68a47069bd9f51cf8cfb00c0182c (patch) | |
| tree | 7bc9bffe57bc1053eb76b1774827d5491a36cca5 /scripts | |
| parent | dd3b8dd21957d4a5d9f2c68a547e984bdf465b63 (diff) | |
| download | spm-54a27ef444fe68a47069bd9f51cf8cfb00c0182c.tar.gz spm-54a27ef444fe68a47069bd9f51cf8cfb00c0182c.tar.bz2 spm-54a27ef444fe68a47069bd9f51cf8cfb00c0182c.tar.xz spm-54a27ef444fe68a47069bd9f51cf8cfb00c0182c.zip | |
In packages move configure and cmake flags into variable CONFIGURE_FLAGS.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/include/common.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/include/common.sh b/scripts/include/common.sh index d4a7ec8..21f00f2 100644 --- a/scripts/include/common.sh +++ b/scripts/include/common.sh @@ -117,19 +117,29 @@ function run_enable_same_dir_build { } function run_configure { + flags="$*" + if [[ "${flags}" == "" ]]; then + flags="${CONFIGURE_FLAGS}" + fi cd "${builddir}" check_error $? - echo "configure --prefix=\"${bindir}\" $*" - "$srcdir"/configure --prefix="${bindir}" $* + echo "configure --prefix=\"${bindir}\" ${flags}" + "$srcdir"/configure --prefix="${bindir}" ${flags} check_error $? + unset flags } function run_cmake { + flags="$*" + if [[ "${flags}" == "" ]]; then + flags="${CONFIGURE_FLAGS}" + fi cd "${builddir}" check_error $? - echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" $*" - cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" $* + echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" ${flags}" + cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags} check_error $? + unset flags } function run_make { |