svn commit: r353052 - in head/lang/clang-cheri: . files

[Brooks Davis]

Author: brooks
Date: Mon May  5 22:09:48 2014
New Revision: 353052
URL: http://svnweb.freebsd.org/changeset/ports/353052
QAT: https://qat.redports.org/buildarchive/r353052/

Log:
  Update to pick up recent LLDB and MIPS assembler improvements.
  
  Mark broken on platforms where the C++11 compiler isn't clang as gcc is
  currently failing and current consumers almost certainly run 10.

Added:
  head/lang/clang-cheri/files/patch-tools__lldb__scripts__Python__build-swig-Python.sh   (contents, props changed)
Deleted:
  head/lang/clang-cheri/files/patch-tools_lldb_scripts_CMakeLists.txt
  head/lang/clang-cheri/files/patch-tools_lldb_scripts_Python_finish-swig-Python-LLDB.sh
Modified:
  head/lang/clang-cheri/Makefile
  head/lang/clang-cheri/distinfo

Modified: head/lang/clang-cheri/Makefile
==============================================================================
--- head/lang/clang-cheri/Makefile	Mon May  5 22:02:09 2014	(r353051)
+++ head/lang/clang-cheri/Makefile	Mon May  5 22:09:48 2014	(r353052)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clang-cheri
-PORTVERSION=	3.4.20140423
-PORTREVISION=	1
+PORTVERSION=	3.4.20140505
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -85,6 +84,10 @@ FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXX
 
 .include <bsd.port.pre.mk>
 
+.if ${CHOSEN_COMPILER_TYPE} == "gcc"
+BROKEN=	build errors when C++11 compiler is gcc
+.endif
+
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
 FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
 

Modified: head/lang/clang-cheri/distinfo
==============================================================================
--- head/lang/clang-cheri/distinfo	Mon May  5 22:02:09 2014	(r353051)
+++ head/lang/clang-cheri/distinfo	Mon May  5 22:09:48 2014	(r353052)
@@ -1,2 +1,2 @@
-SHA256 (clang-cheri-3.4.20140423.tar.bz2) = fa4a5271dc6acb7045176f15517fd98701f4bc0e5b42349bc688e2f2893219c4
-SIZE (clang-cheri-3.4.20140423.tar.bz2) = 30947350
+SHA256 (clang-cheri-3.4.20140505.tar.bz2) = 55d8a7404a975acbc70c34378572e45e92211a2b1a05d7615148a54a853ed70d
+SIZE (clang-cheri-3.4.20140505.tar.bz2) = 31363046

Added: head/lang/clang-cheri/files/patch-tools__lldb__scripts__Python__build-swig-Python.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/clang-cheri/files/patch-tools__lldb__scripts__Python__build-swig-Python.sh	Mon May  5 22:09:48 2014	(r353052)
@@ -0,0 +1,41 @@
+--- ./tools/lldb/scripts/Python/build-swig-Python.sh.orig	2014-05-05 20:41:29.801563675 +0000
++++ ./tools/lldb/scripts/Python/build-swig-Python.sh	2014-05-05 20:42:49.410572418 +0000
+@@ -20,6 +20,8 @@
+ makefile_flag=$7
+ dependency_flag=$8
+ 
++PYTHON=${PYTHON_EXECUTABLE:-/usr/bin/env python}
++
+ if [ -n "$makefile_flag" -a "$makefile_flag" = "-m" ]
+ then
+     MakefileCalled=1
+@@ -292,7 +294,7 @@
+     fi
+ fi
+ 
+-python_version=`/usr/bin/env python --version 2>&1 | sed -e 's,Python ,,' -e 's,[.][0-9],,2' -e 's,[a-z][a-z][0-9],,'`
++python_version=`${PYTHON} --version 2>&1 | sed -e 's,Python ,,' -e 's,[.][0-9],,2' -e 's,[a-z][a-z][0-9],,'`
+ 
+ if [ $MakefileCalled -eq 0 ]
+ then
+@@ -300,9 +302,9 @@
+ else
+     if [ -n "${PYTHON_INSTALL_DIR}" ]
+     then
+-        framework_python_dir=`/usr/bin/env python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False, \"${PYTHON_INSTALL_DIR}\");"`/lldb
++        framework_python_dir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False, \"${PYTHON_INSTALL_DIR}\");"`/lldb
+     else
+-        framework_python_dir=`/usr/bin/env python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False);"`/lldb
++        framework_python_dir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False);"`/lldb
+     fi
+ fi
+ 
+@@ -353,7 +355,7 @@
+ current_dir=`pwd`
+ if [ -f "${current_dir}/modify-python-lldb.py" ]
+ then
+-    /usr/bin/env python ${current_dir}/modify-python-lldb.py ${CONFIG_BUILD_DIR}
++    ${PYTHON} ${current_dir}/modify-python-lldb.py ${CONFIG_BUILD_DIR}
+ fi
+ 
+