imay closed pull request #361: Ubuntu llvm compile URL: https://github.com/apache/incubator-doris/pull/361
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/README.md b/README.md index 75a71e06..e4c94e94 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The simplicity (of developing, deploying and using) and meeting many data servin ## 4. Compile and install Currently support Docker environment and Linux OS: -Docker（Linux/Windows/Mac), Ubuntu and CentOS. +Docker (Linux / Windows / Mac), Ubuntu and CentOS. ### 4.1 For Docker @@ -74,7 +74,7 @@ After successfully building, it will install binary files in the directory outpu #### Prerequisites -GCC 5.3.1+，Oracle JDK 1.8+，Python 2.7+, Apache Maven 3.5.4+ +GCC 5.3.1+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.4.3+ * For Ubuntu: diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index 3edeaad9..560c9cf1 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index d4e7278f..eea00fd0 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -80,9 +80,9 @@ CLANG_NAME=cfe-3.4.2.src.tar.gz CLANG_SOURCE=cfe-3.4.2.src # compiler-rt -COMPILER_RT_DOWNLOAD="http://releases.llvm.org/3.4/compiler-rt-3.4.src.tar.gz"; -COMPILER_RT_NAME=compiler-rt-3.4.src.tar.gz -COMPILER_RT_SOURCE=compiler-rt-3.4 +COMPILER_RT_DOWNLOAD="http://releases.llvm.org/5.0.0/compiler-rt-5.0.0.src.tar.xz"; +COMPILER_RT_NAME=compiler-rt-5.0.0.src.tar.xz +COMPILER_RT_SOURCE=compiler-rt-5.0.0.src # protobuf PROTOBUF_DOWNLOAD="https://github.com/google/protobuf/archive/v3.5.1.tar.gz"; ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
