diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-11-26 03:07:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-11-26 03:07:16 +0300 |
| commit | 27448b615716291c561ebb8f91b38c29024c86ad (patch) | |
| tree | 4f09ae10e9f0d5da3e0cc283224837fa01993daf | |
| parent | 24ae7aea78b5f184ee2ffba085c09b0e7ca9fb65 (diff) | |
| parent | 85c928c3fd96018ca5ca6d27dc7ffa7b63764fa2 (diff) | |
| download | spm-manaplus.tar.gz spm-manaplus.tar.bz2 spm-manaplus.tar.xz spm-manaplus.zip | |
Merge branch 'master' into manaplusmanaplus
| -rw-r--r-- | packages/libbacktrace.sh | 11 | ||||
| -rw-r--r-- | packages/python2.sh | 3 | ||||
| -rw-r--r-- | scripts/include/common.sh | 20 |
3 files changed, 26 insertions, 8 deletions
diff --git a/packages/libbacktrace.sh b/packages/libbacktrace.sh new file mode 100644 index 0000000..bba0dd8 --- /dev/null +++ b/packages/libbacktrace.sh @@ -0,0 +1,11 @@ +# original library broken in configure +#SRCURL=https://github.com/ianlancetaylor/libbacktrace.git +# using patched version +SRCURL=https://github.com/4144/libbacktrace.git + +ENV_PATH="lib:include" +ENV_LD_LIBRARY_PATH="lib" +ENV_LDFLAGS_PATH="lib" +ENV_CPPFLAGS_PATH="include" + +BUILD_TYPE="automake" diff --git a/packages/python2.sh b/packages/python2.sh new file mode 100644 index 0000000..8d72aec --- /dev/null +++ b/packages/python2.sh @@ -0,0 +1,3 @@ +include "python" + +DEFAULT_BRANCH="2.7" diff --git a/scripts/include/common.sh b/scripts/include/common.sh index 974d66c..2383724 100644 --- a/scripts/include/common.sh +++ b/scripts/include/common.sh @@ -18,6 +18,10 @@ function common_build_init { export envname=${package} fi + if [[ "${MAKE}" == "" ]]; then + export MAKE="make" + fi + export srcdir=$(realpath "${dir}/../src/${package}") if [ ! -d "${srcdir}" ]; then echo "Error: Package sources directory not exists for package '${package}'." @@ -111,8 +115,8 @@ function run_autoreconf { echo "cd ${srcdir}/${SUBDIR}" cd "${srcdir}/${SUBDIR}" check_error $? - echo "make distclean" - make distclean + echo "${MAKE} distclean" + ${MAKE} distclean echo "autoreconf ${flags}" autoreconf ${flags} unset flags @@ -169,21 +173,21 @@ function run_make { if [[ "${jobs}" == "" ]]; then if [ -f "/proc/cpuinfo" ]; then jobs="$(cat /proc/cpuinfo|grep processor|wc -l)" + j=" -j${jobs}" else - jobs="1" + j="" fi fi - j=" -j${jobs}" - echo "make$j" - make$j + echo "${MAKE}$j" + ${MAKE}$j check_error $? unset j } function run_make_install { - echo "make install" - make install + echo "${MAKE} install" + ${MAKE} install check_error $? } |