From: Craig Andrews <candrews@gentoo.org>
Date: Sat, 29 Feb 2020 04:23:41 +0000 (-0500)
Subject: libretro-core.eclass: Use | instead of : as sed CLFAGS delimiter
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cfe6000cf7e7e9d6140556384279f5a8d57cd8d0;p=gentoo.git

libretro-core.eclass: Use | instead of : as sed CLFAGS delimiter

Signed-off-by: Craig Andrews <candrews@gentoo.org>
Closes: https://bugs.gentoo.org/710952
Closes: https://bugs.gentoo.org/710972
Closes: https://bugs.gentoo.org/711048
Closes: https://bugs.gentoo.org/710880
---

diff --git a/eclass/libretro-core.eclass b/eclass/libretro-core.eclass
index 768c4701827b..f5f63065f223 100644
--- a/eclass/libretro-core.eclass
+++ b/eclass/libretro-core.eclass
@@ -126,12 +126,12 @@ libretro-core_src_prepare() {
 		# * Add short-rev to Makefile
 		sed \
 			-e 's/\r$//g' \
-			-e "/flags.*=/s:-O[[:digit:]]:${CFLAGS}:g" \
-			-e "/CFLAGS.*=/s:-O[[:digit:]]:${CFLAGS}:g" \
-			-e "/CXXFLAGS.*=/s:-O[[:digit:]]:${CXXFLAGS}:g" \
-			-e "/.*,--version-script=.*/s:$: ${LDFLAGS} ${LIBS}:g" \
-			-e "/\$(CC)/s:\(\$(SHARED)\):\1 ${LDFLAGS} ${LIBS}:" \
-			-e 's:\(\$(CC)\):\1 \$(CFLAGS):g' \
+			-e "/flags.*=/s|-O[[:digit:]]|${CFLAGS}|g" \
+			-e "/CFLAGS.*=/s|-O[[:digit:]]|${CFLAGS}|g" \
+			-e "/CXXFLAGS.*=/s|-O[[:digit:]]|${CXXFLAGS}|g" \
+			-e "/.*,--version-script=.*/s|$| ${LDFLAGS} ${LIBS}|g" \
+			-e "/\$(CC)/s|\(\$(SHARED)\)|\1 ${LDFLAGS} ${LIBS}|" \
+			-e 's|\(\$(CC)\)|\1 \$(CFLAGS)|g' \
 			-e "s/GIT_VERSION\s.=.*$/GIT_VERSION=${custom_libretro_commit_sha}/g" \
 			-i "${makefile}" || die "Failed to use custom cflags in ${makefile}"
 	done