# HG changeset patch # User David Demelier # Date 1554919500 -7200 # Node ID ef725c40d0e8fdd82610aa15f4091e0c33e885f7 # Parent 6ef68e84c7d268bf9bf92a5538df28981bc2c8ee vanilla: use CMAKE_INSTALL_PREFIX= diff -r 6ef68e84c7d2 -r ef725c40d0e8 Templates/cmake.sh --- a/Templates/cmake.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/Templates/cmake.sh Wed Apr 10 20:05:00 2019 +0200 @@ -43,7 +43,7 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ + -DCMAKE_INSTALL_PREFIX= make make install DESTDIR=$DESTDIR popd diff -r 6ef68e84c7d2 -r ef725c40d0e8 dev/clang/clang.sh --- a/dev/clang/clang.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/dev/clang/clang.sh Wed Apr 10 20:05:00 2019 +0200 @@ -67,7 +67,7 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX= \ -DCLANG_VENDOR="Vanilla Linux" \ -DLLVM_ENABLE_EH=On \ -DLLVM_ENABLE_RTTI=On \ diff -r 6ef68e84c7d2 -r ef725c40d0e8 dev/lld/lld.sh --- a/dev/lld/lld.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/dev/lld/lld.sh Wed Apr 10 20:05:00 2019 +0200 @@ -41,7 +41,7 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX= \ -GNinja ninja DESTDIR=$DESTDIR ninja install diff -r 6ef68e84c7d2 -r ef725c40d0e8 dev/lldb/lldb.sh --- a/dev/lldb/lldb.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/dev/lldb/lldb.sh Wed Apr 10 20:05:00 2019 +0200 @@ -41,7 +41,7 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX= \ -DLLVM_ENABLE_EH=On \ -DLLVM_ENABLE_RTTI=On \ -GNinja diff -r 6ef68e84c7d2 -r ef725c40d0e8 dev/llvm/llvm.sh --- a/dev/llvm/llvm.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/dev/llvm/llvm.sh Wed Apr 10 20:05:00 2019 +0200 @@ -70,7 +70,7 @@ mkdir build && pushd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_CXX_COMPILER="$CXX" \ diff -r 6ef68e84c7d2 -r ef725c40d0e8 graphics/libjpeg-turbo/libjpeg-turbo.sh --- a/graphics/libjpeg-turbo/libjpeg-turbo.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/graphics/libjpeg-turbo/libjpeg-turbo.sh Wed Apr 10 20:05:00 2019 +0200 @@ -38,7 +38,7 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX= \ -DCMAKE_INSTALL_LIBDIR=/lib \ -DENABLE_STATIC=Off make diff -r 6ef68e84c7d2 -r ef725c40d0e8 lib/jansson/jansson.sh --- a/lib/jansson/jansson.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/lib/jansson/jansson.sh Wed Apr 10 20:05:00 2019 +0200 @@ -38,7 +38,7 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ + -DCMAKE_INSTALL_PREFIX= make make install DESTDIR=$DESTDIR popd diff -r 6ef68e84c7d2 -r ef725c40d0e8 lib/libc++/libc++.sh --- a/lib/libc++/libc++.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/lib/libc++/libc++.sh Wed Apr 10 20:05:00 2019 +0200 @@ -57,7 +57,7 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX= \ -DLIBCXX_CXX_ABI=$ABI \ -DLIBCXX_HAS_MUSL_LIBC=On \ $with_compiler_rt \ diff -r 6ef68e84c7d2 -r ef725c40d0e8 lib/libc++abi/libc++abi.sh --- a/lib/libc++abi/libc++abi.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/lib/libc++abi/libc++abi.sh Wed Apr 10 20:05:00 2019 +0200 @@ -56,7 +56,7 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX= \ -DLIBCXXABI_LIBCXX_INCLUDES=/include/c++/v1 \ $with_compiler_rt \ $with_libunwind diff -r 6ef68e84c7d2 -r ef725c40d0e8 lib/libunwind/libunwind.sh --- a/lib/libunwind/libunwind.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/lib/libunwind/libunwind.sh Wed Apr 10 20:05:00 2019 +0200 @@ -41,7 +41,7 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_INSTALL_PREFIX= \ -DLIBUNWIND_USE_COMPILER_RT=On make make install DESTDIR=$DESTDIR diff -r 6ef68e84c7d2 -r ef725c40d0e8 lib/libzip/libzip.sh --- a/lib/libzip/libzip.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/lib/libzip/libzip.sh Wed Apr 10 20:05:00 2019 +0200 @@ -43,7 +43,7 @@ -DCMAKE_EXE_LINKER_FLAGS="-lfts" \ -DCMAKE_INSTALL_LIBDIR=/lib \ -DDOCUMENTATION_FORMAT="man" \ - -DCMAKE_INSTALL_PREFIX=/ + -DCMAKE_INSTALL_PREFIX= make make install DESTDIR=$DESTDIR popd diff -r 6ef68e84c7d2 -r ef725c40d0e8 lib/openmp/openmp.sh --- a/lib/openmp/openmp.sh Tue Apr 09 19:44:47 2019 +0200 +++ b/lib/openmp/openmp.sh Wed Apr 10 20:05:00 2019 +0200 @@ -40,7 +40,7 @@ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/ + -DCMAKE_INSTALL_PREFIX= make make install DESTDIR=$DESTDIR popd