svn commit: r438697 - in head/devel: llvm-cheri llvm-devel llvm33 llvm34 llvm35 llvm36 llvm38 llvm39 llvm40

Mathieu Arnold mat at FreeBSD.org
Mon Apr 17 19:47:33 UTC 2017 

Le 17/04/2017 à 17:24, Brooks Davis a écrit :
> On Mon, Apr 17, 2017 at 02:40:16PM +0000, Martin Wilke wrote:
>> Author: miwi
>> Date: Mon Apr 17 14:40:16 2017
>> New Revision: 438697
>> URL: https://svnweb.freebsd.org/changeset/ports/438697
>>
>> Log:
>>   - Fix Shebangs
> Thanks!  Is SHEBANG_FILES safe if an option disables the file in
> question?  If not, this broke most non-default OPTIONS configs.

The shebangfix USES runs during the patch phase, so, it may, or may not,
depending, you should have a look at Mk/Uses/shebangfix.mk (while the
creation of the sed line is not straightforward, the target is very
simple) to see if it breaks or not.

> -- Brooks
>
>> Modified:
>>   head/devel/llvm-cheri/Makefile
>>   head/devel/llvm-devel/Makefile
>>   head/devel/llvm33/Makefile
>>   head/devel/llvm34/Makefile
>>   head/devel/llvm35/Makefile
>>   head/devel/llvm36/Makefile
>>   head/devel/llvm38/Makefile
>>   head/devel/llvm39/Makefile
>>   head/devel/llvm40/Makefile
>>
>> Modified: head/devel/llvm-cheri/Makefile
>> ==============================================================================
>> --- head/devel/llvm-cheri/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm-cheri/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -2,7 +2,7 @@
>>  
>>  PORTNAME=	llvm
>>  PORTVERSION=	${LLVM_MAJOR}.d${SNAPDATE}
>> -PORTREVISION=	1
>> +PORTREVISION=	2
>>  CATEGORIES=	devel lang
>>  PKGNAMESUFFIX=	${LLVM_SUFFIX}
>>  
>> @@ -17,8 +17,12 @@ COMMAND_SUFFIX=	${LLVM_SUFFIX}
>>  DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
>>  DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
>>  
>> -USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5
>> +USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 \
>> +		shebangfix
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
>> +		tools/clang/tools/clang-format/git-clang-format \
>> +		tools/clang/tools/clang-format/clang-format-diff.py
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>>
>> Modified: head/devel/llvm-devel/Makefile
>> ==============================================================================
>> --- head/devel/llvm-devel/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm-devel/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -3,7 +3,7 @@
>>  
>>  PORTNAME=	llvm
>>  PORTVERSION=	${LLVM_MAJOR}.d${SNAPDATE}
>> -PORTREVISION=	1
>> +PORTREVISION=	2
>>  CATEGORIES=	devel lang
>>  PKGNAMESUFFIX=	-devel
>>  
>> @@ -17,10 +17,18 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX
>>  DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
>>  DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
>>  
>> -USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5
>> +USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 \
>> +		shebangfix
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>>  _USES_PYTHON?=	python:build
>>  USES+=		${_USES_PYTHON}
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
>> +		tools/clang/tools/scan-view/bin/scan-view \
>> +		tools/clang/tools/clang-format/git-clang-format \
>> +		tools/clang/tools/clang-format/clang-format-diff.py \
>> +		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
>> +		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \
>> +		tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>>
>> Modified: head/devel/llvm33/Makefile
>> ==============================================================================
>> --- head/devel/llvm33/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm33/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -2,7 +2,7 @@
>>  
>>  PORTNAME=	llvm
>>  PORTVERSION=	3.3
>> -PORTREVISION=	11
>> +PORTREVISION=	12
>>  CATEGORIES=	devel lang
>>  MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
>>  DISTNAME=	${PORTNAME}-${PORTVERSION}.src
>> @@ -18,10 +18,11 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX
>>  DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
>>  DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
>>  
>> -USES=		execinfo gmake perl5
>> +USES=		execinfo gmake perl5 shebangfix
>>  GNU_CONFIGURE=	yes
>>  GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>>
>> Modified: head/devel/llvm34/Makefile
>> ==============================================================================
>> --- head/devel/llvm34/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm34/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -2,7 +2,7 @@
>>  
>>  PORTNAME=	llvm
>>  PORTVERSION=	3.4.2
>> -PORTREVISION=	5
>> +PORTREVISION=	6
>>  CATEGORIES=	devel lang
>>  MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
>>  DISTNAME=	${PORTNAME}-${PORTVERSION}.src
>> @@ -20,10 +20,11 @@ DATADIR=	${PREFIX}/share/${PORTNAME}${LL
>>  
>>  WRKSRC=		${WRKDIR}/llvm-${PORTVERSION}.src
>>  
>> -USES=		execinfo gmake perl5
>> +USES=		execinfo gmake perl5 shebangfix
>>  GNU_CONFIGURE=	yes
>>  GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>>
>> Modified: head/devel/llvm35/Makefile
>> ==============================================================================
>> --- head/devel/llvm35/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm35/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -2,7 +2,7 @@
>>  
>>  PORTNAME=	llvm
>>  DISTVERSION=	3.5.2
>> -PORTREVISION=	3
>> +PORTREVISION=	4
>>  CATEGORIES=	devel lang
>>  MASTER_SITES=	http://llvm.org/releases/3.5.2/
>>  DISTNAME=	${PORTNAME}-${DISTVERSION}.src
>> @@ -18,10 +18,12 @@ DATADIR=	${PREFIX}/share/${PORTNAME}${LL
>>  
>>  WRKSRC=		${WRKDIR}/llvm-${DISTVERSION}.src
>>  
>> -USES=		compiler:c++11-lib execinfo gmake perl5 tar:xz libedit
>> +USES=		compiler:c++11-lib execinfo gmake perl5 tar:xz libedit \
>> +		shebangfix
>>  GNU_CONFIGURE=	yes
>>  GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>>
>> Modified: head/devel/llvm36/Makefile
>> ==============================================================================
>> --- head/devel/llvm36/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm36/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -2,7 +2,7 @@
>>  
>>  PORTNAME=	llvm
>>  DISTVERSION=	3.6.2
>> -PORTREVISION=	3
>> +PORTREVISION=	4
>>  CATEGORIES=	devel lang
>>  MASTER_SITES=	http://llvm.org/releases/3.6.2/
>>  DISTNAME=	${PORTNAME}-${DISTVERSION}.src
>> @@ -19,10 +19,12 @@ DATADIR=	${PREFIX}/share/${PORTNAME}${LL
>>  
>>  WRKSRC=		${WRKDIR}/llvm-${DISTVERSION}.src
>>  
>> -USES=		compiler:c++11-lib execinfo gmake perl5 tar:xz libedit
>> +USES=		compiler:c++11-lib execinfo gmake perl5 tar:xz libedit \
>> +		shebangfix
>>  GNU_CONFIGURE=	yes
>>  GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>>
>> Modified: head/devel/llvm38/Makefile
>> ==============================================================================
>> --- head/devel/llvm38/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm38/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -2,7 +2,7 @@
>>  
>>  PORTNAME=	llvm
>>  DISTVERSION=	3.8.1
>> -PORTREVISION=	7
>> +PORTREVISION=	8
>>  CATEGORIES=	devel lang
>>  MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
>>  DISTNAME=	${PORTNAME}-${DISTVERSION}.src
>> @@ -23,8 +23,15 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX
>>  DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
>>  DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
>>  
>> -USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz
>> +USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz \
>> +		shebangfix
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
>> +		tools/clang/tools/scan-view/bin/scan-view \
>> +		tools/clang/tools/clang-format/git-clang-format \
>> +		tools/clang/tools/clang-format/clang-format-diff.py \
>> +		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
>> +		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>>
>> Modified: head/devel/llvm39/Makefile
>> ==============================================================================
>> --- head/devel/llvm39/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm39/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -2,7 +2,7 @@
>>  
>>  PORTNAME=	llvm
>>  DISTVERSION=	3.9.1
>> -PORTREVISION=	4
>> +PORTREVISION=	5
>>  CATEGORIES=	devel lang
>>  MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
>>  PKGNAMESUFFIX=	${LLVM_SUFFIX}
>> @@ -27,10 +27,18 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX
>>  DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
>>  DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
>>  
>> -USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz
>> +USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz \
>> +		shebangfix
>>  _USES_PYTHON?=	python:build
>>  USES+=		${_USES_PYTHON}
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
>> +		tools/clang/tools/scan-view/bin/scan-view \
>> +		tools/clang/tools/clang-format/git-clang-format \
>> +		tools/clang/tools/clang-format/clang-format-diff.py \
>> +		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
>> +		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \
>> +		tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>>
>> Modified: head/devel/llvm40/Makefile
>> ==============================================================================
>> --- head/devel/llvm40/Makefile	Mon Apr 17 14:35:00 2017	(r438696)
>> +++ head/devel/llvm40/Makefile	Mon Apr 17 14:40:16 2017	(r438697)
>> @@ -2,7 +2,7 @@
>>  
>>  PORTNAME=	llvm
>>  DISTVERSION=	4.0.0
>> -PORTREVISION=	3
>> +PORTREVISION=	4
>>  CATEGORIES=	devel lang
>>  MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
>>  PKGNAMESUFFIX=	${LLVM_SUFFIX}
>> @@ -28,10 +28,18 @@ LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX
>>  DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
>>  DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
>>  
>> -USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz
>> +USES=		cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz \
>> +		shebangfix
>>  _USES_PYTHON?=	python:build
>>  USES+=		${_USES_PYTHON}
>>  USE_LDCONFIG=	${LLVM_PREFIX}/lib
>> +SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
>> +		tools/clang/tools/scan-view/bin/scan-view \
>> +		tools/clang/tools/clang-format/git-clang-format \
>> +		tools/clang/tools/clang-format/clang-format-diff.py \
>> +		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
>> +		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \
>> +		tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py
>>  
>>  SUB_FILES=	llvm-wrapper.sh
>>  SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
>> _______________________________________________
>> svn-ports-all at freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
>> To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
>>



-- 
Mathieu Arnold


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20170417/761599b8/attachment.sig>

More information about the svn-ports-head mailing list