svn commit: r318794 - in head: devel/llvm lang/clang
Brooks Davis
brooks at FreeBSD.org
Wed May 22 20:21:08 UTC 2013
Author: brooks
Date: Wed May 22 20:21:07 2013
New Revision: 318794
URL: http://svnweb.freebsd.org/changeset/ports/318794
Log:
Add a new option MANPAGES to allow man pages to be supressed. [0]
Remove USE_GCC=4.2+ as all supported versions have an acceptable version
of gcc by default.[0]
Remove the long unused MAINTAINER_MODE variable.
Submitted by: tijl [0]
Modified:
head/devel/llvm/Makefile
head/lang/clang/Makefile
Modified: head/devel/llvm/Makefile
==============================================================================
--- head/devel/llvm/Makefile Wed May 22 19:52:49 2013 (r318793)
+++ head/devel/llvm/Makefile Wed May 22 20:21:07 2013 (r318794)
@@ -7,6 +7,7 @@
PORTNAME= llvm
PORTVERSION= 3.2
+PORTREVISION= 1
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
@@ -15,7 +16,6 @@ MAINTAINER= brooks at FreeBSD.org
COMMENT= Low Level Virtual Machine
LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
-BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx
.if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash
.endif
@@ -26,7 +26,6 @@ BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c
CONFLICTS= llvm-devel-[23]* llvm29-* llvm31-*
GNU_CONFIGURE= yes
-USE_GCC= 4.2+
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_PERL5= yes
@@ -39,25 +38,27 @@ MAKE_ARGS+= REQUIRES_RTTI=1
LIBNAME= libLLVM-${DISTVERSION:C/\.r[0-9]*//}.so
CONFIGURE_ARGS+= --enable-bindings=none
+CONFIGURE_ARGS+= --enable-optimized
-OPTIONS_DEFINE= ASSERTS DOCS LTOPLUGIN
+OPTIONS_DEFINE= ASSERTS DOCS LTOPLUGIN MANPAGES
ASSERTS_DESC= Enable assertions (thread unsafe)
LTOPLUGIN_DESC= Build LTO plugin (requires gold)
-MAN1= bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
- llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \
- llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \
- llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1
+OPTIONS_DEFAULT= MANPAGES
PLIST_SUB+= PORTVERSION=${PORTVERSION}
.include <bsd.port.options.mk>
-.if defined(MAINTAINER_MODE)
-CONFIGURE_ARGS+= --with-f2c=${LOCALBASE}
+.if ${PORT_OPTIONS:MASSERTS}
+CONFIGURE_ARGS+= --enable-assertions
.else
-CONFIGURE_ARGS+= --enable-optimized
+CONFIGURE_ARGS+= --disable-assertions
+.endif
+
+.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
+BUILD_DEPENDS+= sphinx-build:${PORTSDIR}/textproc/py-sphinx
.endif
.if ${PORT_OPTIONS:MDOCS}
@@ -66,12 +67,6 @@ CONFIGURE_ARGS+= --enable-docs
CONFIGURE_ARGS+= --disable-docs
.endif
-.if ${PORT_OPTIONS:MASSERTS}
-CONFIGURE_ARGS+= --enable-assertions
-.else
-CONFIGURE_ARGS+= --disable-assertions
-.endif
-
.if ${PORT_OPTIONS:MLTOPLUGIN}
BUILD_DEPENDS+= ld.gold:${PORTSDIR}/devel/binutils
RUN_DEPENDS+= ld.gold:${PORTSDIR}/devel/binutils
@@ -79,6 +74,13 @@ CONFIGURE_ARGS+= --with-binutils-include
PLIST_FILES+= lib/LLVMgold.so
.endif
+.if ${PORT_OPTIONS:MMANPAGES}
+MAN1= bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
+ llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \
+ llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \
+ llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1
+.endif
+
.include <bsd.port.pre.mk>
.if ${ARCH} == "arm"
@@ -104,7 +106,9 @@ post-patch:
${WRKSRC}/Makefile.config.in
post-build:
+.if ${PORT_OPTIONS:MMANPAGES}
@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man
+.endif
.if ${PORT_OPTIONS:MDOCS}
@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html
.endif
@@ -114,8 +118,8 @@ post-install:
${LN} -s ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME}
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}/html
- find ${WRKSRC}/docs/_build/html -type f | \
- xargs -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/
+ ${FIND} ${WRKSRC}/docs/_build/html -type f | \
+ ${XARGS} -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/
.endif
.for man in ${MAN1}
@${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${man} \
Modified: head/lang/clang/Makefile
==============================================================================
--- head/lang/clang/Makefile Wed May 22 19:52:49 2013 (r318793)
+++ head/lang/clang/Makefile Wed May 22 20:21:07 2013 (r318794)
@@ -7,7 +7,7 @@
PORTNAME= clang
PORTVERSION= 3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel
MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
@@ -18,7 +18,7 @@ EXTRACT_ONLY= ${LLVM_SOURCE}
MAINTAINER= brooks at FreeBSD.org
COMMENT= C, Objective-C, and C++ compiler
-CONFLICTS= clang-devel-[23]* clang31-*
+CONFLICTS= clang-devel-[23]*
CLANG_NAME= clang-${PORTVERSION}.src
CLANG_SOURCE= ${CLANG_NAME}${EXTRACT_SUFX}
@@ -31,15 +31,11 @@ INSTALL_WRKSRC= ${WRKSRC}/tools/clang
BUILD_DEPENDS+= llvm>=${PORTVERSION}:${PORTSDIR}/devel/llvm
RUN_DEPENDS+= llvm>=${PORTVERSION}:${PORTSDIR}/devel/llvm
-.if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
+.if defined(PACKAGE_BUILDING)
BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu
.endif
-.if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c
-.endif
GNU_CONFIGURE= yes
-USE_GCC= 4.2+
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_PERL5= yes
@@ -55,16 +51,20 @@ OPTIONS_DEFINE= ASSERTS DOCS
ASSERTS_DESC= Enable assertions (thread unsafe)
+CONFIGURE_ARGS+= --enable-optimized
+
MAN1= clang.1
PLIST_SUB+= PORTVERSION=${PORTVERSION}
.include <bsd.port.options.mk>
-.if defined(MAINTAINER_MODE)
-CONFIGURE_ARGS+= --with-f2c=${LOCALBASE}
+.if ${PORT_OPTIONS:MASSERTS}
+CONFIGURE_ARGS+= --enable-assertions
+RELTYPE= Release+Asserts
.else
-CONFIGURE_ARGS+= --enable-optimized
+CONFIGURE_ARGS+= --disable-assertions
+RELTYPE= Release
.endif
.if ${PORT_OPTIONS:MDOCS}
@@ -73,14 +73,6 @@ CONFIGURE_ARGS+= --enable-docs
CONFIGURE_ARGS+= --disable-docs
.endif
-.if ${PORT_OPTIONS:MASSERTS}
-CONFIGURE_ARGS+= --enable-assertions
-RELTYPE= Release+Asserts
-.else
-CONFIGURE_ARGS+= --disable-assertions
-RELTYPE= Release
-.endif
-
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
@@ -119,6 +111,7 @@ post-build:
@cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1
post-install:
+ @${LN} -sf clang ${PREFIX}/bin/clang-cpp
@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
${WRKSRC}/tools/clang/tools/scan-build/c++-analyzer \
${WRKSRC}/tools/clang/tools/scan-build/scan-build \
@@ -150,6 +143,7 @@ PLIST_FILE_LIST= bin/ccc-analyzer \
bin/clang \
bin/clang++ \
bin/clang-check \
+ bin/clang-cpp \
bin/clang-tblgen \
bin/c-index-test \
bin/scan-build \
More information about the svn-ports-all
mailing list