summaryrefslogtreecommitdiff
path: root/cppunit
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-08-17 20:20:32 +0300
committerTor Lillqvist <tml@iki.fi>2012-08-17 20:28:49 +0300
commitb2315f6b7b7f3976c0ec5c470ae67ca4e8732643 (patch)
treeda137b8267eb89272cdea6f2eb22c637b7b56270 /cppunit
parent0e843513a237024ab330e1d358f8ff4a952203a8 (diff)
Use dlerror()
Change-Id: Id4cb837d7c2441df1c46795a52385e2e0e605a46
Diffstat (limited to 'cppunit')
-rw-r--r--cppunit/makefile.mk2
-rw-r--r--cppunit/unix.patch15
2 files changed, 16 insertions, 1 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 446067db5686..03927e6d5b4c 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -32,7 +32,7 @@ TARGET = cppunit
TARFILE_NAME=cppunit-1.13.0
TARFILE_MD5=0c65c839854edd43d9294d1431a2b292
-PATCH_FILES = windows.patch
+PATCH_FILES = windows.patch unix.patch
.IF "$(OS)" == "ANDROID"
PATCH_FILES += android.patch
diff --git a/cppunit/unix.patch b/cppunit/unix.patch
new file mode 100644
index 000000000000..2c55463f6e55
--- /dev/null
+++ b/cppunit/unix.patch
@@ -0,0 +1,15 @@
+--- misc/cppunit-1.13.0/src/cppunit/UnixDynamicLibraryManager.cpp
++++ misc/build/cppunit-1.13.0/src/cppunit/UnixDynamicLibraryManager.cpp
+@@ -34,7 +34,11 @@
+ std::string
+ DynamicLibraryManager::getLastErrorDetail() const
+ {
+- return "";
++ const char *last_dlerror = ::dlerror();
++ if (last_dlerror != NULL)
++ return last_dlerror;
++ else
++ return "";
+ }
+
+