diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-06 20:20:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-06 20:20:59 +0300 |
| commit | 91fa963b6fc2f3255ce810786d390b1a0b0550e1 (patch) | |
| tree | 6673c45064adca97cb65a3e0e7254186df4b0f52 | |
| parent | 0a431c451786233810a30354509dddaa12bacf3a (diff) | |
| parent | 22a367e95ea7ddac5f91840e429738f0b40b3c5e (diff) | |
| download | spm-91fa963b6fc2f3255ce810786d390b1a0b0550e1.tar.gz spm-91fa963b6fc2f3255ce810786d390b1a0b0550e1.tar.bz2 spm-91fa963b6fc2f3255ce810786d390b1a0b0550e1.tar.xz spm-91fa963b6fc2f3255ce810786d390b1a0b0550e1.zip | |
Merge branch 'master' into SDL
| -rw-r--r-- | packages/drm.sh | 10 | ||||
| -rw-r--r-- | packages/mesa.sh | 11 | ||||
| -rw-r--r-- | scripts/include/common.sh | 10 |
3 files changed, 26 insertions, 5 deletions
diff --git a/packages/drm.sh b/packages/drm.sh new file mode 100644 index 0000000..dcbf883 --- /dev/null +++ b/packages/drm.sh @@ -0,0 +1,10 @@ +SRCURL=git://anongit.freedesktop.org/git/mesa/drm + +ENV_PATH="etc:bin:lib:include" +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" +ENV_LDFLAGS_PATH="lib" +ENV_MANPATH="share/man" +ENV_CPPFLAGS_PATH="include" + +BUILD_TYPE="automake" diff --git a/packages/mesa.sh b/packages/mesa.sh new file mode 100644 index 0000000..76bd32c --- /dev/null +++ b/packages/mesa.sh @@ -0,0 +1,11 @@ +SRCURL=git://anongit.freedesktop.org/git/mesa/mesa + +ENV_PATH="bin:lib:include" +ENV_LD_LIBRARY_PATH="lib" +ENV_PKG_CONFIG_PATH="lib/pkgconfig" +ENV_LDFLAGS_PATH="lib" +ENV_MANPATH="share/man" +ENV_CPPFLAGS_PATH="include" + +BUILD_TYPE="automake" +CONFIGURE_FLAGS='--enable-gles1 --enable-gles2 --enable-gles3 --with-gallium-drivers="" --with-dri-drivers="i915 i965" --with-vulkan-drivers="intel"' diff --git a/scripts/include/common.sh b/scripts/include/common.sh index 4fcb426..929bc7a 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 } @@ -405,7 +405,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 |