hrev50632 adds 1 changeset to branch 'master'
old head: a034dfb647f1ba6ff4e5b04c494ed5c4ec9b9f56
new head: 65f5e1e1b286b19ff6f6f4a38f402b541509faf5
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=65f5e1e1b286+%5Ea034dfb647f1
----------------------------------------------------------------------------
65f5e1e1b286: Fix #12799: Enable elf symbol patching for Haiku
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Mark Hellegers <mark@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev50632
Commit: 65f5e1e1b286b19ff6f6f4a38f402b541509faf5
URL: http://cgit.haiku-os.org/haiku/commit/?id=65f5e1e1b286
Author: Mark Hellegers <mark@xxxxxxxxxxxx>
Date: Sat May 28 19:47:00 2016 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Sun Oct 30 09:42:24 2016 UTC
Ticket: https://dev.haiku-os.org/ticket/12799
----------------------------------------------------------------------------
3 files changed, 7 insertions(+), 7 deletions(-)
headers/tools/cppunit/TestShell.h | 4 ++++
src/tools/cppunit/Jamfile | 6 +++---
src/tools/cppunit/TestShell.cpp | 4 ----
----------------------------------------------------------------------------
diff --git a/headers/tools/cppunit/TestShell.h
b/headers/tools/cppunit/TestShell.h
index 2704e13..a139585 100644
--- a/headers/tools/cppunit/TestShell.h
+++ b/headers/tools/cppunit/TestShell.h
@@ -17,7 +17,11 @@ class BDirectory;
class BLocker;
class BPath;
+#ifndef NO_ELF_SYMBOL_PATCHING
+#include <tools/elfsymbolpatcher/ElfSymbolPatcher.h>
+#else
class ElfSymbolPatchGroup;
+#endif
// Defines SuiteFunction to be a pointer to a function that
// takes no arguments and returns a pointer to a CppUnit::Test
diff --git a/src/tools/cppunit/Jamfile b/src/tools/cppunit/Jamfile
index ffb20ad..0dea61c 100644
--- a/src/tools/cppunit/Jamfile
+++ b/src/tools/cppunit/Jamfile
@@ -11,7 +11,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) cppunit ] ;
{
DEFINES += BUILDING_CPPUNIT ;
- if $(OS) != BEOS || $(OSPLAT) = PPC {
+ if ( $(OS) != BEOS && $(OS) != HAIKU ) || $(OSPLAT) = PPC {
DEFINES += NO_ELF_SYMBOL_PATCHING ;
}
}
@@ -52,8 +52,8 @@ SharedLibrary libcppunit.so :
: be [ TargetLibstdc++ ]
;
-if $(OS) = BEOS && $(OSPLAT) != PPC {
- LinkAgainst libcppunit.so : libelfsymbolpatcher.a ;
+if ( $(OS) = BEOS || $(OS) = HAIKU ) && $(OSPLAT) != PPC {
+ LinkAgainst libcppunit.so : libelfsymbolpatcher.a debug ;
}
# To run the tests we need the cppunit library.
diff --git a/src/tools/cppunit/TestShell.cpp b/src/tools/cppunit/TestShell.cpp
index 61abf51..1cbf482 100644
--- a/src/tools/cppunit/TestShell.cpp
+++ b/src/tools/cppunit/TestShell.cpp
@@ -22,10 +22,6 @@
#include <TestShell.h>
#include <TestListener.h>
-#ifndef NO_ELF_SYMBOL_PATCHING
-# include <ElfSymbolPatcher.h>
-#endif
-
using std::cout;
using std::endl;
using std::set;
