diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-29 05:51:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-29 05:51:49 +0300 |
| commit | b6c100fa8562b0e94cb1a0693ad2b05295a438ee (patch) | |
| tree | a2621a7067a43b033f911139f7111f6916af1401 | |
| parent | bcc9eab980e077cf004d253a2aca2207c76022a5 (diff) | |
| parent | 2953f358edbfa6d339776f3c0d8794920869c675 (diff) | |
| download | spm-b6c100fa8562b0e94cb1a0693ad2b05295a438ee.tar.gz spm-b6c100fa8562b0e94cb1a0693ad2b05295a438ee.tar.bz2 spm-b6c100fa8562b0e94cb1a0693ad2b05295a438ee.tar.xz spm-b6c100fa8562b0e94cb1a0693ad2b05295a438ee.zip | |
Merge branch 'master' into libpng
| -rw-r--r-- | packages/freetype.sh | 1 | ||||
| -rw-r--r-- | packages/libxml2.sh | 2 | ||||
| -rw-r--r-- | packages/manaplus.sh | 1 | ||||
| -rw-r--r-- | packages/stdman.sh | 5 | ||||
| -rw-r--r-- | scripts/include/common.sh | 4 |
5 files changed, 10 insertions, 3 deletions
diff --git a/packages/freetype.sh b/packages/freetype.sh index 659cb60..df11765 100644 --- a/packages/freetype.sh +++ b/packages/freetype.sh @@ -10,3 +10,4 @@ ENV_CPPFLAGS_PATH="include" BUILD_TYPE="automake" SRC_INIT_COMMAND="./autogen.sh" +CONFIGURE_FLAGS="--with-harfbuzz=no" diff --git a/packages/libxml2.sh b/packages/libxml2.sh index b649b8f..88d1b73 100644 --- a/packages/libxml2.sh +++ b/packages/libxml2.sh @@ -9,4 +9,4 @@ ENV_ACLOCAL_PATH="share/aclocal" ENV_CPPFLAGS_PATH="include/libxml2" BUILD_TYPE="automake" -CONFIGURE_FLAGS="--without-python"
\ No newline at end of file +CONFIGURE_FLAGS="--without-python --with-icu" diff --git a/packages/manaplus.sh b/packages/manaplus.sh index 1b784f1..95ee74a 100644 --- a/packages/manaplus.sh +++ b/packages/manaplus.sh @@ -4,3 +4,4 @@ ENV_PATH="bin" ENV_MANPATH="share/man" BUILD_TYPE="automake" +CONFIGURE_FLAGS="--without-dyecmd" diff --git a/packages/stdman.sh b/packages/stdman.sh new file mode 100644 index 0000000..76f1635 --- /dev/null +++ b/packages/stdman.sh @@ -0,0 +1,5 @@ +SRCURL=https://github.com/jeaye/stdman.git + +ENV_MANPATH="share/man" +ENABLE_SAME_DIR_BUILD="true" +BUILD_TYPE="configure" diff --git a/scripts/include/common.sh b/scripts/include/common.sh index 382f8a5..4fcb426 100644 --- a/scripts/include/common.sh +++ b/scripts/include/common.sh @@ -311,7 +311,7 @@ function common_use_package { echo "" >>"${envfile}" package_use check_error $? - echo "\$*" >>"${envfile}" + echo "\"\$@\"" >>"${envfile}" check_error $? chmod 0755 "${envfile}" check_error $? @@ -348,7 +348,7 @@ function common_use_packages { check_error $? done unset IFS - echo "\$*" >>"${envfile}" + echo "\"\$@\"" >>"${envfile}" check_error $? chmod 0755 "${envfile}" check_error $? |