Date: Sat, 30 Jan 2016 12:39:14 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407523 - in head/devel/libclc: . files Message-ID: <201601301239.u0UCdEvM015378@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601301239.u0UCdEvM015378>