Ticket #12226: 0001-hvif2png-fix-for-builds-on-MacOS-X.patch

File 0001-hvif2png-fix-for-builds-on-MacOS-X.patch, 1.5 KB (added by apl-haiku, 9 years ago)

  • build/jam/BuildSetup 

    From 4c267d47ee94528a5273fbcfa11c8df1649281c7 Mon Sep 17 00:00:00 2001
From: Andrew Lindesay <apl@lindesay.co.nz>
Date: Wed, 22 Jul 2015 23:34:45 +1200
Subject: [PATCH] hvif2png : fix for builds on MacOS-X

* support for macports lib and include dirs
* linking lib change for hvif2png on MacOS-X

Ticket #12226
---
 build/jam/BuildSetup       | 11 +++++++++++
 src/tools/hvif2png/Jamfile |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index d917140..d97d48f 100644
    a b if $(HOST_PLATFORM_BEOS_COMPATIBLE) {  
    541541            HOST_DEFINES += HAIKU_HOST_USE_XATTR_REF ;
    542542        }
    543543    }
     544
     545}
     546
     547# support for macports header location
     548if $(HOST_PLATFORM) = darwin  && [ GLOB /opt/local : include ] {
     549        HOST_HDRS += /opt/local/include ;
     550}
     551
     552# support for macports lib location
     553if $(HOST_PLATFORM) = darwin  && [ GLOB /opt/local : lib ] {
     554        HOST_LINKFLAGS += -L/opt/local/lib ;
    544555}
    545556
    546557# network libraries

  • src/tools/hvif2png/Jamfile 

    diff --git a/src/tools/hvif2png/Jamfile b/src/tools/hvif2png/Jamfile
index 10b698c..6173ff1 100644
    a b UsePrivateBuildHeaders shared ;  
    44
    55USES_BE_API on <build>hvif2png = true ;
    66
     7HVIF2PNG_LIBS = $(HOST_LIBBE) $(HOST_LIBROOT) png ;
     8
     9if $(HOST_PLATFORM) = darwin {
     10    HVIF2PNG_LIBS += stdc++ ;
     11}
     12
    713BuildPlatformMain <build>hvif2png :
    814    hvif2png.cpp
    915    :
    10     $(HOST_LIBBE) $(HOST_LIBROOT) png
     16    $(HVIF2PNG_LIBS)
    1117;