rayburgemeestre
/
build-config
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Bump clang from 7 to version 9.

master
Ray Burgemeestre 5 年前
父节点
f9261863b3
当前提交
35cc21aacc
共有 8 个文件被更改，包括 39 次插入 和 39 次删除
合并视图 显示文件统计
  1. +4
    -4
      Dockerfile-ubuntu1804
  2. +5
    -5
      allegro5/Makefile
  3. +5
    -5
      benchmarklib/Makefile
  4. +5
    -5
      boost/Makefile
  5. +5
    -5
      caf/Makefile
  6. +5
    -5
      crtmpserver/Makefile
  7. +5
    -5
      fastpfor/Makefile
  8. +5
    -5
      v8pp/Makefile

+ 4
- 4
Dockerfile-ubuntu1804 查看文件

apt-get -y install g++ git sudo wget gnupg2 && \ apt-get -y install g++ git sudo wget gnupg2 && \
apt-get -y install libssl-dev build-essential && \ apt-get -y install libssl-dev build-essential && \
\ \
echo deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main >> /etc/apt/sources.list && \
echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main >> /etc/apt/sources.list && \
echo deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main >> /etc/apt/sources.list && \
echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main >> /etc/apt/sources.list && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - ; \ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - ; \
apt update -y && \ apt update -y && \
apt-get install -y clang-7 lldb-7 lld-7 && \
apt-get install -y libc++-7-dev libc++-7-dev && \
apt-get install -y clang-9 lldb-9 lld-9 && \
apt-get install -y libc++-9-dev libc++-9-dev && \
\ \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*



+ 5
- 5
allegro5/Makefile 查看文件

libpng-dev libjpeg-dev libfreetype6-dev \ libpng-dev libjpeg-dev libfreetype6-dev \
libxrandr-dev libxinerama-dev libxi-dev \ libxrandr-dev libxinerama-dev libxi-dev \
libgtk2.0-dev libgtk2.0-dev
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-7 40
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-9 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-9 40
# static build # static build
pushd allegro5 && \ pushd allegro5 && \
cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=$$PWD/allegro5_static -DSHARED=off -DSTATIC=on -DWANT_FFMPEG=off -DWANT_TTF=on . && \ cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=$$PWD/allegro5_static -DSHARED=off -DSTATIC=on -DWANT_FFMPEG=off -DWANT_TTF=on . && \

+ 5
- 5
benchmarklib/Makefile 查看文件

make package make package


impl: impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-7 40
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-9 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-9 40
# TODO install boost from apt repo # TODO install boost from apt repo
# if [[ -f CMakeCache.txt ]]; then rm CMakeCache.txt; fi # if [[ -f CMakeCache.txt ]]; then rm CMakeCache.txt; fi
dpkg -i boost/pkg/*.deb dpkg -i boost/pkg/*.deb

+ 5
- 5
boost/Makefile 查看文件

make package make package


impl: impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-7 40
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-9 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-9 40
pushd boost_1_72_0 && \ pushd boost_1_72_0 && \
mkdir -p target && \ mkdir -p target && \
CXX=$$(which c++) ./bootstrap.sh --prefix=$$PWD/target/ --with-toolset=clang && \ CXX=$$(which c++) ./bootstrap.sh --prefix=$$PWD/target/ --with-toolset=clang && \

+ 5
- 5
caf/Makefile 查看文件

make package make package


impl: impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-7 40
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-9 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-9 40
pushd actor-framework && \ pushd actor-framework && \
./configure --prefix=$$PWD/caf_out --with-clang=$$(which c++) --build-static-only \ ./configure --prefix=$$PWD/caf_out --with-clang=$$(which c++) --build-static-only \
--no-examples \ --no-examples \

+ 5
- 5
crtmpserver/Makefile 查看文件

apt-get install -y libssl1.0-dev apt-get install -y libssl1.0-dev
# rm -rf crtmpserver/builders/cmake/CMakeCache.txt # rm -rf crtmpserver/builders/cmake/CMakeCache.txt
# switch to clang 7, crtmpserver build broken with g++ # switch to clang 7, crtmpserver build broken with g++
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-7 40
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-9 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-9 40
pushd crtmpserver/builders/cmake && \ pushd crtmpserver/builders/cmake && \
make clean || true && \ make clean || true && \
rm -rf CMakeCache.txt && \ rm -rf CMakeCache.txt && \

+ 5
- 5
fastpfor/Makefile 查看文件

make package make package


impl: impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-7 40
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-9 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-9 40
pushd FastPFor && \ pushd FastPFor && \
CXX=$$(which c++) cmake . && \ CXX=$$(which c++) cmake . && \
make -j $$(nproc) make -j $$(nproc)

+ 5
- 5
v8pp/Makefile 查看文件

make package make package


build: build:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-7 40
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-9 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-9 40
apt-get update apt-get update
apt-get install pkg-config -y apt-get install pkg-config -y
cd v8pp && ./build-v8.sh cd v8pp && ./build-v8.sh

撰写 预览
正在加载...
取消
保存