i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "cppunit: Enable elf symbol patching for Haiku."

Browse Source 
This reverts commit 56430ad800.

It builds on my machine, but apparently the buildbots choke on it...
This commit is contained in:
Augustin Cavalier
2016-06-18 18:57:48 -04:00
parent fa2dd9c45f
commit 73e180c9b9
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/tools/cppunit/TestShell.h
+1 -3
View File
@@ -17,9 +17,7 @@ class BDirectory;
class BLocker; class BLocker;
class BPath; class BPath;
#ifndef NO_ELF_SYMBOL_PATCHING class ElfSymbolPatchGroup;
#include <tools/elfsymbolpatcher/ElfSymbolPatcher.h>
#endif
// Defines SuiteFunction to be a pointer to a function that // Defines SuiteFunction to be a pointer to a function that
// takes no arguments and returns a pointer to a CppUnit::Test // takes no arguments and returns a pointer to a CppUnit::Test
src/tools/cppunit/Jamfile
+3 -3
View File
@@ -11,7 +11,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) cppunit ] ;
{ {
DEFINES += BUILDING_CPPUNIT ; DEFINES += BUILDING_CPPUNIT ;
if ( $(OS) != BEOS && $(OS) != HAIKU ) || $(OSPLAT) = PPC { if $(OS) != BEOS || $(OSPLAT) = PPC {
DEFINES += NO_ELF_SYMBOL_PATCHING ; DEFINES += NO_ELF_SYMBOL_PATCHING ;
} }
} }
@@ -52,8 +52,8 @@ SharedLibrary libcppunit.so :
: be [ TargetLibstdc++ ] : be [ TargetLibstdc++ ]
; ;
if ( $(OS) = BEOS || $(OS) = HAIKU ) && $(OSPLAT) != PPC { if $(OS) = BEOS && $(OSPLAT) != PPC {
LinkAgainst libcppunit.so : libelfsymbolpatcher.a debug ; LinkAgainst libcppunit.so : libelfsymbolpatcher.a ;
} }
# To run the tests we need the cppunit library. # To run the tests we need the cppunit library.
src/tools/cppunit/TestShell.cpp
+4
View File
@@ -22,6 +22,10 @@
#include <TestShell.h> #include <TestShell.h>
#include <TestListener.h> #include <TestListener.h>
#ifndef NO_ELF_SYMBOL_PATCHING
# include <ElfSymbolPatcher.h>
#endif
using std::cout; using std::cout;
using std::endl; using std::endl;
using std::set; using std::set;