diff options
| author | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2014-11-02 01:44:22 +0000 |
|---|---|---|
| committer | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2014-11-02 01:44:22 +0000 |
| commit | 20ac1d36b9237f40914a06872d878b27548431ea (patch) | |
| tree | ca93672377cde38cbba6afd65ddd852254df49ce /devel/ccons | |
| parent | ba125053de16a4a6d45dd298f51a01adc9eea5d3 (diff) | |
| download | ports-20ac1d36b9237f40914a06872d878b27548431ea.tar.gz ports-20ac1d36b9237f40914a06872d878b27548431ea.zip | |
- Fix the 'Argument defined more than once' error during runtime
Notes
Notes:
svn path=/head/; revision=372052
Diffstat (limited to 'devel/ccons')
| -rw-r--r-- | devel/ccons/Makefile | 12 | ||||
| -rw-r--r-- | devel/ccons/files/ccons.sh.in | 5 | ||||
| -rw-r--r-- | devel/ccons/files/patch-CMakeLists.txt | 18 |
3 files changed, 29 insertions, 6 deletions
diff --git a/devel/ccons/Makefile b/devel/ccons/Makefile index 9852056702f9..93b61f19aeed 100644 --- a/devel/ccons/Makefile +++ b/devel/ccons/Makefile @@ -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 < 9.0-RELEASE .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> diff --git a/devel/ccons/files/ccons.sh.in b/devel/ccons/files/ccons.sh.in new file mode 100644 index 000000000000..679267bed3e8 --- /dev/null +++ b/devel/ccons/files/ccons.sh.in @@ -0,0 +1,5 @@ +#!/bin/sh +# $FreeBSD$ + +LD_LIBRARY_PATH="%%LOCALBASE%%/llvm33/lib/" %%LOCALBASE%%/bin/ccons-bin + diff --git a/devel/ccons/files/patch-CMakeLists.txt b/devel/ccons/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..9bc4602b0d4d --- /dev/null +++ b/devel/ccons/files/patch-CMakeLists.txt @@ -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) + |