Ticket #12799: 0001-Fix-12799-Enable-elf-symbol-patching-for-Haiku.patch

File 0001-Fix-12799-Enable-elf-symbol-patching-for-Haiku.patch, 2.0 KB (added by markh, 8 years ago)

  • headers/tools/cppunit/TestShell.h 

    From 424dfa52031a44c331f23805224b7c3bc6f849f2 Mon Sep 17 00:00:00 2001
From: Mark Hellegers <mark@firedisk.net>
Date: Sat, 28 May 2016 19:47:00 +0000
Subject: [PATCH] Fix #12799: Enable elf symbol patching for Haiku

---
 headers/tools/cppunit/TestShell.h | 4 ++++
 src/tools/cppunit/Jamfile         | 6 +++---
 src/tools/cppunit/TestShell.cpp   | 4 ----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/headers/tools/cppunit/TestShell.h b/headers/tools/cppunit/TestShell.h
index 2704e13..a139585 100644
    a b class BDirectory;  
    1717class BLocker;
    1818class BPath;
    1919
     20#ifndef NO_ELF_SYMBOL_PATCHING
     21#include <tools/elfsymbolpatcher/ElfSymbolPatcher.h>
     22#else
    2023class ElfSymbolPatchGroup;
     24#endif
    2125
    2226// Defines SuiteFunction to be a pointer to a function that
    2327// takes no arguments and returns a pointer to a CppUnit::Test

  • src/tools/cppunit/Jamfile 

    diff --git a/src/tools/cppunit/Jamfile b/src/tools/cppunit/Jamfile
index ffb20ad..0dea61c 100644
    a b SEARCH_SOURCE += [ FDirName $(SUBDIR) cppunit ] ;  
    1111{
    1212    DEFINES += BUILDING_CPPUNIT ;
    1313
    14     if $(OS) != BEOS || $(OSPLAT) = PPC {
     14    if ( $(OS) != BEOS && $(OS) != HAIKU ) || $(OSPLAT) = PPC {
    1515        DEFINES += NO_ELF_SYMBOL_PATCHING ;
    1616    }
    1717}
    … … SharedLibrary libcppunit.so :  
    5252    : be [ TargetLibstdc++ ]
    5353;
    5454
    55 if  $(OS) = BEOS && $(OSPLAT) != PPC {
    56     LinkAgainst libcppunit.so : libelfsymbolpatcher.a ;
     55if  ( $(OS) = BEOS || $(OS) = HAIKU ) && $(OSPLAT) != PPC {
     56    LinkAgainst libcppunit.so : libelfsymbolpatcher.a debug ;
    5757}
    5858
    5959# To run the tests we need the cppunit library.

  • src/tools/cppunit/TestShell.cpp 

    diff --git a/src/tools/cppunit/TestShell.cpp b/src/tools/cppunit/TestShell.cpp
index 61abf51..1cbf482 100644
    a b  
    2222#include <TestShell.h>
    2323#include <TestListener.h>
    2424
    25 #ifndef NO_ELF_SYMBOL_PATCHING
    26 #   include <ElfSymbolPatcher.h>
    27 #endif
    28 
    2925using std::cout;
    3026using std::endl;
    3127using std::set;