boomerang: Fix prefix in dlopen().

We already have the correct library dir in our search path, so we don't need to
prepend lib/ again.
This commit is contained in:
aszlig 2012-08-10 15:02:19 +02:00
parent a6e266306f
commit d10772ec8a
2 changed files with 15 additions and 0 deletions

View File

@ -14,6 +14,8 @@ stdenv.mkDerivation {
install -vD boomerang "$out/bin/boomerang" install -vD boomerang "$out/bin/boomerang"
''; '';
patches = [ ./dlopen_path.patch ];
src = fetchgit { src = fetchgit {
url = "git://github.com/aszlig/boomerang.git"; url = "git://github.com/aszlig/boomerang.git";
rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22"; rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22";

View File

@ -0,0 +1,13 @@
diff --git a/loader/BinaryFileFactory.cpp b/loader/BinaryFileFactory.cpp
index 889a4ed..ca86765 100644
--- a/loader/BinaryFileFactory.cpp
+++ b/loader/BinaryFileFactory.cpp
@@ -109,7 +109,7 @@ BinaryFile* BinaryFileFactory::getInstanceFor( const char *sName ) {
// Load the specific loader library
#ifndef _WIN32 // Cygwin, Unix/Linux
- libName = std::string("lib/lib") + libName;
+ libName = std::string("lib") + libName;
#ifdef __CYGWIN__
libName += ".dll"; // Cygwin wants .dll, but is otherwise like Unix
#else