Merge pull request #36178 from babariviere/master
bear: fix LD_PRELOAD error
This commit is contained in:
commit
6a5cc4f8cc
|
@ -71,6 +71,7 @@
|
||||||
auntie = "Jonathan Glines <auntieNeo@gmail.com>";
|
auntie = "Jonathan Glines <auntieNeo@gmail.com>";
|
||||||
avnik = "Alexander V. Nikolaev <avn@avnik.info>";
|
avnik = "Alexander V. Nikolaev <avn@avnik.info>";
|
||||||
aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
|
aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
|
||||||
|
babariviere = "Bastien Riviere <babariviere@protonmail.com>";
|
||||||
bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
|
bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
|
||||||
backuitist = "Bruno Bieth";
|
backuitist = "Bruno Bieth";
|
||||||
badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
|
badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
|
||||||
|
|
13
pkgs/development/tools/build-managers/bear/cmakepaths.patch
Normal file
13
pkgs/development/tools/build-managers/bear/cmakepaths.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 04c5c58..429ca47 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue")
|
||||||
|
|
||||||
|
set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||||
|
set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear")
|
||||||
|
-set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.")
|
||||||
|
+set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.")
|
||||||
|
|
||||||
|
add_subdirectory(libear)
|
||||||
|
add_subdirectory(bear)
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
doCheck = false; # all fail
|
doCheck = false; # all fail
|
||||||
|
|
||||||
patches = [ ./ignore_wrapper.patch ];
|
patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Tool that generates a compilation database for clang tooling";
|
description = "Tool that generates a compilation database for clang tooling";
|
||||||
|
@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = https://github.com/rizsotto/Bear;
|
homepage = https://github.com/rizsotto/Bear;
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.vcunat ];
|
maintainers = [ maintainers.vcunat maintainers.babariviere ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue