Date: Sun, 2 Nov 2014 01:44:22 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372052 - in head/devel/ccons: . files Message-ID: <201411020144.sA21iMWJ082209@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Sun Nov 2 01:44:22 2014 New Revision: 372052 URL: https://svnweb.freebsd.org/changeset/ports/372052 QAT: https://qat.redports.org/buildarchive/r372052/ Log: - Fix the 'Argument defined more than once' error during runtime Added: head/devel/ccons/files/ccons.sh.in (contents, props changed) head/devel/ccons/files/patch-CMakeLists.txt (contents, props changed) Modified: head/devel/ccons/Makefile Modified: head/devel/ccons/Makefile ============================================================================== --- head/devel/ccons/Makefile Sun Nov 2 01:19:03 2014 (r372051) +++ head/devel/ccons/Makefile Sun Nov 2 01:44:22 2014 (r372052) @@ -3,7 +3,7 @@ PORTNAME= ccons PORTVERSION= r251 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GOOGLE_CODE @@ -22,11 +22,10 @@ ONLY_FOR_ARCHS= i386 amd64 USES= cmake CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config33 CXXFLAGS+= -fno-rtti -LDFLAGS+= -lclang -CXX= clang++33 -CC= clang33 -PLIST_FILES= bin/ccons man/man1/ccons.1.gz +SUB_FILES= ccons.sh +PLIST_FILES= bin/ccons man/man1/ccons.1.gz \ + bin/ccons-bin WRKSRC= ${WRKDIR}/ccons @@ -41,7 +40,8 @@ BROKEN= ccons does not work on FreeBSD < .endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/ccons ${STAGEDIR}${PREFIX}/bin/ccons + @${INSTALL_PROGRAM} ${WRKSRC}/ccons ${STAGEDIR}${PREFIX}/bin/ccons-bin + @${INSTALL_SCRIPT} ${WRKDIR}/ccons.sh ${STAGEDIR}${PREFIX}/bin/ccons @${INSTALL_MAN} ${WRKSRC}/man/ccons.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ccons.1 .include <bsd.port.post.mk> Added: head/devel/ccons/files/ccons.sh.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ccons/files/ccons.sh.in Sun Nov 2 01:44:22 2014 (r372052) @@ -0,0 +1,5 @@ +#!/bin/sh +# $FreeBSD$ + +LD_LIBRARY_PATH="%%LOCALBASE%%/llvm33/lib/" %%LOCALBASE%%/bin/ccons-bin + Added: head/devel/ccons/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ccons/files/patch-CMakeLists.txt Sun Nov 2 01:44:22 2014 (r372052) @@ -0,0 +1,18 @@ +--- CMakeLists.txt.orig 2013-06-22 02:01:31 UTC ++++ CMakeLists.txt +@@ -8,13 +8,13 @@ if(NOT LLVM_CONFIG_EXECUTABLE) + message(FATAL_ERROR "LLVM was not found!") + endif(NOT LLVM_CONFIG_EXECUTABLE) + +-exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libs engine target linker bitreader bitwriter codegen mc mcdisassembler instrumentation x86 OUTPUT_VARIABLE LLVM_LIBS) ++set(LLVM_LIBS "-lLLVM-3.3") + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libdir OUTPUT_VARIABLE LLVM_LIBDIR) + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS) + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIR) + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE LLVM_C_FLAGS) + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_CXX_FLAGS) +-set(CLANG_LIBS "-lclangFrontend -lclangAST -lclangLex -lclangCodeGen -lclangSema -lclangSerialization -lclangParse -lclangAST -lclangBasic -lclangAnalysis -lclangEdit") ++set(CLANG_LIBS "-lclang -lclangCodeGen -lclangAST") + + Project(ccons) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411020144.sA21iMWJ082209>