From owner-svn-ports-all@freebsd.org Sat Jan 30 12:39:15 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F02EA71A2C; Sat, 30 Jan 2016 12:39:15 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DB3F184D; Sat, 30 Jan 2016 12:39:15 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0UCdE7Y015391; Sat, 30 Jan 2016 12:39:14 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0UCdEvM015378; Sat, 30 Jan 2016 12:39:14 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201601301239.u0UCdEvM015378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 30 Jan 2016 12:39:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407523 - in head/devel/libclc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2016 12:39:15 -0000 Author: marino Date: Sat Jan 30 12:39:13 2016 New Revision: 407523 URL: https://svnweb.freebsd.org/changeset/ports/407523 Log: devel/libclc: Use ports libedit (build dependency) The LLVM_TOOL_LINK builds a helper tool named utils/prepare-builtins that requires libedit which in turn pulls in libtinfo (part of libncurses). In order to support builds on platforms without base ncurses (e.g. DF), require base libedit. This requires an additional -L LDFLAGS to search ${LOCALBASE}/lib for the needed libs. (prepare-builtins is not installed) Approved by: kwm (maintainer) Modified: head/devel/libclc/Makefile head/devel/libclc/files/patch-configure.py Modified: head/devel/libclc/Makefile ============================================================================== --- head/devel/libclc/Makefile Sat Jan 30 12:39:05 2016 (r407522) +++ head/devel/libclc/Makefile Sat Jan 30 12:39:13 2016 (r407523) @@ -8,7 +8,8 @@ CATEGORIES= devel MAINTAINER= kwm@FreeBSD.org COMMENT= Required library functions for OpenCL C programming language -BUILD_DEPENDS= clang${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER} +BUILD_DEPENDS= clang${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER} \ + libedit>=0:${PORTSDIR}/devel/libedit USE_GITHUB= yes GH_ACCOUNT= llvm-mirror Modified: head/devel/libclc/files/patch-configure.py ============================================================================== --- head/devel/libclc/files/patch-configure.py Sat Jan 30 12:39:05 2016 (r407522) +++ head/devel/libclc/files/patch-configure.py Sat Jan 30 12:39:13 2016 (r407523) @@ -1,6 +1,22 @@ ---- configure.py.orig 2014-02-14 21:33:53.000000000 +0100 -+++ configure.py 2014-08-20 13:42:06.162076745 +0200 -@@ -228,7 +228,7 @@ +The LLVM_TOOL_LINK builds a helper tool named utils/prepare-builtins that +requires libedit which in turn pulls in libtinfo (part of libncurses). +In order to support builds on platforms without base ncurses (e.g. DF), +require base libedit. This requires an additional -L LDFLAGS to search +${LOCALBASE}/lib for the needed libs. (prepare-builtins is not installed) + +--- configure.py.orig 2015-07-10 13:37:04 UTC ++++ configure.py +@@ -118,7 +118,8 @@ b.rule("OPT", command = llvm_opt + " -O3 + description = 'OPT $out') + + c_compiler_rule(b, "LLVM_TOOL_CXX", 'CXX', cxx_compiler, llvm_cxxflags) +-b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + " -Wl,-rpath %s" % llvm_libdir, 'LINK $out') ++b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + ++ " -L" + prefix + "/lib -Wl,-rpath %s" % llvm_libdir, 'LINK $out') + + prepare_builtins = os.path.join('utils', 'prepare-builtins') + b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX", +@@ -264,7 +265,7 @@ install_cmd = ' && '.join(['mkdir -p ${D {'src': file, 'dst': libexecdir} for (file, dest) in install_files_bc])