Updates vendored mason to v0.4 for LLVM 3.9.1
This commit is contained in:
+8
-6
@@ -1,17 +1,19 @@
|
||||
language: generic
|
||||
|
||||
sudo: false
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- os: osx
|
||||
osx_image: xcode7.3
|
||||
osx_image: xcode8
|
||||
compiler: clang
|
||||
- os: linux
|
||||
compiler: clang
|
||||
sudo: false
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- libstdc++-5-dev
|
||||
|
||||
script:
|
||||
- ./mason build ${MASON_NAME} ${MASON_VERSION}
|
||||
|
||||
after_success:
|
||||
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
|
||||
|
||||
+7
-5
@@ -19,9 +19,11 @@ function mason_load_source {
|
||||
|
||||
function mason_prepare_compile {
|
||||
cd $(dirname ${MASON_ROOT})
|
||||
${MASON_DIR}/mason install jpeg_turbo 1.4.2
|
||||
MASON_JPEG=$(${MASON_DIR}/mason prefix jpeg_turbo 1.4.2)
|
||||
SYSTEM_ZLIB="/usr"
|
||||
${MASON_DIR}/mason install jpeg_turbo 1.5.0
|
||||
MASON_JPEG=$(${MASON_DIR}/mason prefix jpeg_turbo 1.5.0)
|
||||
# depends on sudo apt-get install zlib1g-dev
|
||||
${MASON_DIR}/mason install zlib system
|
||||
MASON_ZLIB=$(${MASON_DIR}/mason prefix zlib system)
|
||||
}
|
||||
|
||||
|
||||
@@ -35,8 +37,8 @@ function mason_compile {
|
||||
--enable-chunky-strip-read \
|
||||
--with-jpeg-include-dir=${MASON_JPEG}/include \
|
||||
--with-jpeg-lib-dir=${MASON_JPEG}/lib \
|
||||
--with-zlib-include-dir=${SYSTEM_ZLIB}/include \
|
||||
--with-zlib-lib-dir=${SYSTEM_ZLIB}/lib \
|
||||
--with-zlib-include-dir=${MASON_ZLIB}/include \
|
||||
--with-zlib-lib-dir=${MASON_ZLIB}/lib \
|
||||
--disable-lzma --disable-jbig --disable-mdi \
|
||||
--without-x
|
||||
|
||||
|
||||
Reference in New Issue
Block a user