svn commit: r335889 - in head/devel: llvm llvm31 llvm32

Marcus von Appen mva at FreeBSD.org
Sun Dec 8 13:25:50 UTC 2013


Author: mva
Date: Sun Dec  8 13:25:49 2013
New Revision: 335889
URL: http://svnweb.freebsd.org/changeset/ports/335889

Log:
  - Fix the usage of 'python' to get rid of the implicit lang/python
    dependency
  
  Approved by:	portmgr (blanket)

Modified:
  head/devel/llvm/Makefile
  head/devel/llvm31/Makefile
  head/devel/llvm32/Makefile

Modified: head/devel/llvm/Makefile
==============================================================================
--- head/devel/llvm/Makefile	Sun Dec  8 13:24:03 2013	(r335888)
+++ head/devel/llvm/Makefile	Sun Dec  8 13:25:49 2013	(r335889)
@@ -25,9 +25,19 @@ DEPRECATED=	Migrate to devel/llvm32 or n
 EXPIRATION_DATE=	2013-11-04
 
 GNU_CONFIGURE=	yes
-USES=		gmake perl5
+USES=		gmake perl5 shebangfix
 USE_LDCONFIG=	yes
-USE_PYTHON_BUILD=	yes
+USE_PYTHON_BUILD=	2
+
+python_OLD_CMD=	/usr/bin/env python
+python_CMD=	/usr/bin/env python2
+SHEBANG_FILES=	test/Scripts/coff-dump.py test/Scripts/elf-dump \
+		test/Scripts/macho-dumpx lib/Target/NVPTX/gen-register-defs.py \
+		utils/clang-parse-diagnostics-file utils/release/findRegressions-nightly.py \
+		utils/release/findRegressions-simple.py utils/Misc/zkill \
+		utils/llvm-lit/llvm-lit.in utils/Target/ARM/analyze-match-table.py \
+		utils/llvm-build/llvm-build utils/lit/lit.py utils/lit/lit/ProgressBar.py \
+		utils/lit/lit/main.py
 
 # Suggested tweaks from http://llvm.org/docs/Packaging.html
 CONFIGURE_ARGS+=	--enable-shared

Modified: head/devel/llvm31/Makefile
==============================================================================
--- head/devel/llvm31/Makefile	Sun Dec  8 13:24:03 2013	(r335888)
+++ head/devel/llvm31/Makefile	Sun Dec  8 13:25:49 2013	(r335889)
@@ -21,10 +21,21 @@ BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 
 CONFLICTS=	llvm-[3]* llvm-devel-[23]* llvm29-*
 
-USES=		gmake perl5
+USES=		gmake perl5 shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PYTHON_BUILD=	yes
+USE_PYTHON_BUILD=	2
+
+python_OLD_CMD=	/usr/bin/env python
+python_CMD=	/usr/bin/env python2
+SHEBANG_FILES=	test/Scripts/coff-dump.py test/Scripts/elf-dump \
+		test/Scripts/macho-dumpx utils/clang-parse-diagnostics-file \
+		utils/lit/lit/main.py utils/lit/lit/ProgressBar.py \
+		utils/lit/lit.py utils/llvm-build/llvm-build \
+		utils/llvm-lit/llvm-lit.in utils/Misc/zkill \
+		utils/release/findRegressions-nightly.py \
+		utils/release/findRegressions-simple.py \
+		utils/Target/ARM/analyze-match-table.py
 
 # Suggested tweaks from http://llvm.org/docs/Packaging.html
 CONFIGURE_ARGS+=	--enable-shared

Modified: head/devel/llvm32/Makefile
==============================================================================
--- head/devel/llvm32/Makefile	Sun Dec  8 13:24:03 2013	(r335888)
+++ head/devel/llvm32/Makefile	Sun Dec  8 13:25:49 2013	(r335889)
@@ -19,11 +19,23 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
-USES=		gmake perl5
+USES=		gmake perl5 shebangfix
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 
+python_OLD_CMD=	/usr/bin/env python
+python_CMD=	/usr/bin/env python2
+SHEBANG_FILES=	test/Scripts/coff-dump.py test/Scripts/elf-dump \
+		test/Scripts/macho-dumpx lib/Target/NVPTX/gen-register-defs.py \
+		utils/clang-parse-diagnostics-file \
+		utils/release/findRegressions-nightly.py \
+		utils/release/findRegressions-simple.py \
+		utils/Misc/zkill utils/llvm-lit/llvm-lit.in \
+		utils/Target/ARM/analyze-match-table.py \
+		utils/llvm-build/llvm-build utils/lit/lit.py \
+		utils/lit/lit/ProgressBar.py utils/lit/lit/main.py
+
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 


More information about the svn-ports-head mailing list