rayburgemeestre
/
build-config
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Introduce switch-to-latest-clang script

master
rayburgemeestre 3 years ago
parent
515d2753e9
commit
aeb86dbcc2
14 changed files with 26 additions and 62 deletions
Split View Show Diff Stats
  1. +4
    -0
      Dockerfile-ubuntu2004
  2. +1
    -5
      allegro5/Makefile
  3. +1
    -5
      benchmarklib/Makefile
  4. +1
    -5
      boost/Makefile
  5. +1
    -5
      caf/Makefile
  6. +2
    -6
      crtmpserver/Makefile
  7. +1
    -5
      fastpfor/Makefile
  8. +1
    -5
      fmt/Makefile
  9. +1
    -5
      imagemagick/Makefile
  10. +1
    -5
      openexr/Makefile
  11. +1
    -5
      seasocks/Makefile
  12. +1
    -6
      sfml/Makefile
  13. +9
    -0
      switch-to-latest-clang
  14. +1
    -5
      v8pp/Makefile

+ 4
- 0
Dockerfile-ubuntu2004 View File

@@ -34,4 +34,8 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3
# Fix some weird linker issue CAF build runs into. (fails to link -lc++abi)
RUN cp -prv /usr/lib/llvm-12/lib/libc++abi.so.1.0 /usr/lib/llvm-12/lib/libc++abi.so

COPY switch-to-latest-clang /usr/local/bin/switch-to-latest-clang

RUN chmod +x /usr/local/bin/switch-to-latest-clang

CMD "/bin/bash"

+ 1
- 5
allegro5/Makefile View File

@@ -24,11 +24,7 @@ prep:
libpng-dev libjpeg-dev libfreetype6-dev \
libxrandr-dev libxinerama-dev libxi-dev \
libgtk2.0-dev libsdl2-dev
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang

impl:
make prep

+ 1
- 5
benchmarklib/Makefile View File

@@ -7,11 +7,7 @@ benchmarklib:
make package

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

+ 1
- 5
boost/Makefile View File

@@ -15,11 +15,7 @@ ubuntu2004:
bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R

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

+ 1
- 5
caf/Makefile View File

@@ -7,11 +7,7 @@ caf:
make package

impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang
pushd actor-framework && \
CXX="$(which c++)" ./configure --cxx-flags="-stdlib=libstdc++" --disable-shared-libs --prefix=$$PWD/caf_out && \
echo patch CMakeLists.txt ../caf-cmakefile.patch && \

+ 2
- 6
crtmpserver/Makefile View File

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

+ 1
- 5
fastpfor/Makefile View File

@@ -15,11 +15,7 @@ ubuntu2004:

impl:
patch FastPFor/CMakeLists.txt libcpp.patch
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang
pushd FastPFor && \
CXX=$$(which c++) cmake . && \
make -j $$(nproc)

+ 1
- 5
fmt/Makefile View File

@@ -7,11 +7,7 @@ ubuntu2004:
bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R # fix permissions

impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang
apt-get update && apt-get install libz-dev -y && \
pushd fmt && \
mkdir build && pushd build && \

+ 1
- 5
imagemagick/Makefile View File

@@ -7,11 +7,7 @@ ubuntu2004:
bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R # fix permissions

impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang
apt-get update && apt-get install libz-dev autoconf -y && \
apt-get install -y libpng-dev libxcb-render0-dev libxcb-shm0-dev libxcb1-dev libtiff-dev libtiff5-dev libtiffxx5 && \
dpkg -i openexr/pkg/*.deb && \

+ 1
- 5
openexr/Makefile View File

@@ -7,11 +7,7 @@ ubuntu2004:
bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R # fix permissions

impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang
apt-get update && apt-get install libz-dev -y && \
pushd openexr && \
mkdir build && pushd build && \

+ 1
- 5
seasocks/Makefile View File

@@ -12,11 +12,7 @@ ubuntu2004:
bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R # fix permissions

impl:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang
apt-get update && apt-get install libz-dev -y && \
pushd seasocks && \
mkdir build && pushd build && \

+ 1
- 6
sfml/Makefile View File

@@ -23,12 +23,7 @@ impl:
libgtk2.0-dev
# extra needed
apt-get install -y libudev-dev libopenal-dev libflac-dev libvorbis-dev

update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang
# static build
pushd SFML && \
cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=$$PWD/sfml_static -DBUILD_SHARED_LIBS=false . && \

+ 9
- 0
switch-to-latest-clang View File

@@ -0,0 +1,9 @@
#!/bin/bash

set -ex

update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-12 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-12 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-12 40

+ 1
- 5
v8pp/Makefile View File

@@ -30,11 +30,7 @@ ubuntu2004:
bash ../ubuntu2004.sh chown $$(id -u):$$(id -g) . -R # fix permissions

build:
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-10 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 40
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
switch-to-latest-clang
apt-get update
apt-get install pkg-config python2.7 -y
cp -prv /usr/bin/python2.7 /usr/bin/python # stupid depot tool scripts

Write Preview
Loading…
Cancel
Save