Attachment 137627 Details for Bug 183252 – file.diff

[patch] file.diff

file.diff (text/plain), 1.62 KB, created by Brooks Davis on 2013-10-23 23:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brooks Davis

Created: 2013-10-23 23:20:02 UTC

Size: 1.62 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 331432)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	opengtl
> PORTVERSION=	0.9.18
>+PORTREVISION=	1
> CATEGORIES=	graphics devel
> MASTER_SITES=	http://download.${PORTNAME}.org/
> DISTNAME=	OpenGTL-${PORTVERSION}
>@@ -12,12 +13,13 @@
> LICENSE=	LGPL20
> 
> LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
>-BUILD_DEPENDS=	${LOCALBASE}/lib/libLLVM-3.2.so:${PORTSDIR}/devel/llvm
>+BUILD_DEPENDS=	llvm-config32:${PORTSDIR}/devel/llvm32
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USE_BZIP2=	yes
> USES=		cmake perl5
> USE_LDCONFIG=	yes
>+CMAKE_ARGS=	-DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config32
> 
> OPTIONS_DEFINE=	SHIVA
> OPTIONS_DEFAULT=SHIVA
>@@ -26,7 +28,6 @@
> 
> PLIST_SUB+=	PORTVERSION=${PORTVERSION}
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MSHIVA}
>Index: files/patch-cmake_modules_FindLLVM.cmake
>===================================================================
>--- files/patch-cmake_modules_FindLLVM.cmake	(revision 0)
>+++ files/patch-cmake_modules_FindLLVM.cmake	(working copy)
>@@ -0,0 +1,21 @@
>+
>+$FreeBSD$
>+
>+--- cmake/modules/FindLLVM.cmake.orig
>++++ cmake/modules/FindLLVM.cmake
>+@@ -27,11 +27,13 @@
>+       set(LLVM_FOUND TRUE)
>+     endif(LLVM_INCLUDE_DIR AND LLVM_LIBS_DIR)
>+   else (MSVC)
>+-    find_program(LLVM_CONFIG_EXECUTABLE
>++    if(NOT LLVM_CONFIG_EXECUTABLE)
>++      find_program(LLVM_CONFIG_EXECUTABLE
>+         NAMES llvm-config
>+         PATHS
>+         /opt/local/bin
>+-    )
>++      )
>++    endif()
>+     
>+     exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE LLVM_VERSION )
>+

Actions: View | Diff

Attachments on bug 183252: 137627