diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-07 04:46:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-07 04:46:36 +0300 |
| commit | 928281736e79fd7ecd5ab658efdc7a9a5cbe5025 (patch) | |
| tree | 745b491a1b507880bd2bc09f07e29dac2a787615 /scripts/include/common.sh | |
| parent | b6c100fa8562b0e94cb1a0693ad2b05295a438ee (diff) | |
| parent | e37b5a61ef34a0f5dc2dbc48105dbcfde6e03271 (diff) | |
| download | spm-928281736e79fd7ecd5ab658efdc7a9a5cbe5025.tar.gz spm-928281736e79fd7ecd5ab658efdc7a9a5cbe5025.tar.bz2 spm-928281736e79fd7ecd5ab658efdc7a9a5cbe5025.tar.xz spm-928281736e79fd7ecd5ab658efdc7a9a5cbe5025.zip | |
Merge branch 'master' into libpng
Diffstat (limited to 'scripts/include/common.sh')
| -rw-r--r-- | scripts/include/common.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/include/common.sh b/scripts/include/common.sh index 4fcb426..bdc71e0 100644 --- a/scripts/include/common.sh +++ b/scripts/include/common.sh @@ -126,8 +126,8 @@ function run_autoreconf { function run_src_script { cd "${srcdir}" check_error $? - echo $* - $* + echo $@ + $@ check_error $? } @@ -146,7 +146,7 @@ function run_configure { cd "${builddir}" check_error $? echo "configure --prefix=\"${bindir}\" ${flags}" - "$srcdir"/configure --prefix="${bindir}" ${flags} + eval "$srcdir"/configure --prefix="${bindir}" ${flags} check_error $? unset flags } @@ -159,7 +159,7 @@ function run_cmake { cd "${builddir}" check_error $? echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" ${flags}" - cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags} + eval cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags} check_error $? unset flags } @@ -298,8 +298,10 @@ function package_use { repack_paths "$ENV_PKG_CONFIG_PATH" "$OVERRIDE_ENV_PKG_CONFIG_PATH" "PKG_CONFIG_PATH" repack_paths "$ENV_MANPATH" "$OVERRIDE_ENV_MANPATH" "MANPATH" repack_paths "$ENV_ACLOCAL_PATH" "$OVERRIDE_ENV_ACLOCAL_PATH" "ACLOCAL_PATH" + repack_paths "$ENV_LIBGL_DRIVERS_PATH" "$OVERRIDE_ENV_LIBGL_DRIVERS_PATH" "LIBGL_DRIVERS_PATH" repack_flags "$ENV_LDFLAGS_PATH" "$OVERRIDE_ENV_LDFLAGS_PATH" "LDFLAGS" "-L" repack_flags "$ENV_CPPFLAGS_PATH" "$OVERRIDE_ENV_CPPFLAGS_PATH" "CPPFLAGS" "-I" + repack_flags "$ENV_LIBGL_DRIVERS_PATH" "$OVERRIDE_ENV_LIBGL_DRIVERS_PATH" "LIBGL_DRIVERS_PATH" } function common_use_package { @@ -405,7 +407,7 @@ function package_build { run_enable_same_dir_build fi if [[ "$SRC_INIT_COMMAND" != "" ]]; then - run_src_script "$SRC_INIT_COMMAND" + eval run_src_script "$SRC_INIT_COMMAND" fi case "$BUILD_TYPE" in |