Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jun 2020 04:07:20 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r538368 - in head/devel: llvm-cheri llvm-devel llvm10 llvm60 llvm70 llvm80 llvm90
Message-ID:  <202006100407.05A47Kmw031792@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Wed Jun 10 04:07:19 2020
New Revision: 538368
URL: https://svnweb.freebsd.org/changeset/ports/538368

Log:
  devel/llvm*: Avoid extraneous escapes
  
  All of these single quotes are safe on their own, as they're enclosed in
  double quotes. Removes the escapes, because they're currently passed through
  to the underlying regex engine as \' to be interpreted as '.
  
  A future change will forbid this escape, then an even further future change
  will actually imbue \' with special meaning based on GNU interpretation
  ("end of subject").
  
  No PORTREVISION bump or rebuild is needed, as they're functionally
  equivalent.
  
  PR:		247058
  Approved by:	koobs (mentor), brooks (maintainer)
  MFH:		2020Q2 (blanket: trivial build fix)

Modified:
  head/devel/llvm-cheri/Makefile
  head/devel/llvm-devel/Makefile
  head/devel/llvm10/Makefile
  head/devel/llvm60/Makefile
  head/devel/llvm70/Makefile
  head/devel/llvm80/Makefile
  head/devel/llvm90/Makefile

Modified: head/devel/llvm-cheri/Makefile
==============================================================================
--- head/devel/llvm-cheri/Makefile	Wed Jun 10 03:38:32 2020	(r538367)
+++ head/devel/llvm-cheri/Makefile	Wed Jun 10 04:07:19 2020	(r538368)
@@ -267,7 +267,7 @@ post-patch:
 	    ${WRKSRC}/llvm/utils/lit/lit.py ${WRKSRC}/llvm/utils/lit/lit/*.py
 
 post-patch-LLD-on:
-		${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \
+		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/lld/docs/conf.py
 
 post-install:

Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile	Wed Jun 10 03:38:32 2020	(r538367)
+++ head/devel/llvm-devel/Makefile	Wed Jun 10 04:07:19 2020	(r538368)
@@ -372,7 +372,7 @@ post-patch-CLANG-on:
 	    ${PATCH_WRKSRC}/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
-		${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \
+		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/lld/docs/conf.py
 
 post-install:

Modified: head/devel/llvm10/Makefile
==============================================================================
--- head/devel/llvm10/Makefile	Wed Jun 10 03:38:32 2020	(r538367)
+++ head/devel/llvm10/Makefile	Wed Jun 10 04:07:19 2020	(r538368)
@@ -480,7 +480,7 @@ post-patch-CLANG-on:
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
-		${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \
+		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/tools/lld/docs/conf.py
 
 post-build-COMPILER_RT-on:

Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm60/Makefile	Wed Jun 10 03:38:32 2020	(r538367)
+++ head/devel/llvm60/Makefile	Wed Jun 10 04:07:19 2020	(r538368)
@@ -315,7 +315,7 @@ post-patch-CLANG-on:
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
-		${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \
+		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/tools/lld/docs/conf.py
 
 post-build-COMPILER_RT-on:

Modified: head/devel/llvm70/Makefile
==============================================================================
--- head/devel/llvm70/Makefile	Wed Jun 10 03:38:32 2020	(r538367)
+++ head/devel/llvm70/Makefile	Wed Jun 10 04:07:19 2020	(r538368)
@@ -335,7 +335,7 @@ post-patch-CLANG-on:
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
-		${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \
+		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/tools/lld/docs/conf.py
 
 post-build-COMPILER_RT-on:

Modified: head/devel/llvm80/Makefile
==============================================================================
--- head/devel/llvm80/Makefile	Wed Jun 10 03:38:32 2020	(r538367)
+++ head/devel/llvm80/Makefile	Wed Jun 10 04:07:19 2020	(r538368)
@@ -403,7 +403,7 @@ post-extract-OPENMP-on:
 	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp
 
 post-patch-LLD-on:
-	${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \
+	${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 		${PATCH_WRKSRC}/tools/lld/docs/conf.py
 
 post-patch:

Modified: head/devel/llvm90/Makefile
==============================================================================
--- head/devel/llvm90/Makefile	Wed Jun 10 03:38:32 2020	(r538367)
+++ head/devel/llvm90/Makefile	Wed Jun 10 04:07:19 2020	(r538368)
@@ -455,7 +455,7 @@ post-patch-CLANG-on:
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
-		${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \
+		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/tools/lld/docs/conf.py
 
 post-build-COMPILER_RT-on:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006100407.05A47Kmw031792>