ports/183252: Switch graphics/opengtl's LLVM port

Brooks Davis brooks at FreeBSD.org
Wed Oct 23 22:20:03 UTC 2013


>Number:         183252
>Category:       ports
>Synopsis:       Switch graphics/opengtl's LLVM port
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 23 22:20:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Brooks Davis
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r255453: Mon Sep 16 12:43:32 UTC 2013 root at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64

devel/llvm is deprecated and has been replaced by devel/llvm32 this patch
switches opengtl to use the new port which also allows llvm33 or llvm-devel
to be install at the same time.

	
>Description:
	
>How-To-Repeat:
	
>Fix:

Switch to using devel/llvm32.
STAGEify.

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 )
+     

>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list