| 1 |
commit: cfe6000cf7e7e9d6140556384279f5a8d57cd8d0 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 29 04:23:41 2020 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 29 04:35:42 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe6000c |
| 7 |
|
| 8 |
libretro-core.eclass: Use | instead of : as sed CLFAGS delimiter |
| 9 |
|
| 10 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 11 |
Closes: https://bugs.gentoo.org/710952 |
| 12 |
Closes: https://bugs.gentoo.org/710972 |
| 13 |
Closes: https://bugs.gentoo.org/711048 |
| 14 |
Closes: https://bugs.gentoo.org/710880 |
| 15 |
|
| 16 |
eclass/libretro-core.eclass | 12 ++++++------ |
| 17 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/libretro-core.eclass b/eclass/libretro-core.eclass |
| 20 |
index 768c4701827..f5f63065f22 100644 |
| 21 |
--- a/eclass/libretro-core.eclass |
| 22 |
+++ b/eclass/libretro-core.eclass |
| 23 |
@@ -126,12 +126,12 @@ libretro-core_src_prepare() { |
| 24 |
# * Add short-rev to Makefile |
| 25 |
sed \ |
| 26 |
-e 's/\r$//g' \ |
| 27 |
- -e "/flags.*=/s:-O[[:digit:]]:${CFLAGS}:g" \ |
| 28 |
- -e "/CFLAGS.*=/s:-O[[:digit:]]:${CFLAGS}:g" \ |
| 29 |
- -e "/CXXFLAGS.*=/s:-O[[:digit:]]:${CXXFLAGS}:g" \ |
| 30 |
- -e "/.*,--version-script=.*/s:$: ${LDFLAGS} ${LIBS}:g" \ |
| 31 |
- -e "/\$(CC)/s:\(\$(SHARED)\):\1 ${LDFLAGS} ${LIBS}:" \ |
| 32 |
- -e 's:\(\$(CC)\):\1 \$(CFLAGS):g' \ |
| 33 |
+ -e "/flags.*=/s|-O[[:digit:]]|${CFLAGS}|g" \ |
| 34 |
+ -e "/CFLAGS.*=/s|-O[[:digit:]]|${CFLAGS}|g" \ |
| 35 |
+ -e "/CXXFLAGS.*=/s|-O[[:digit:]]|${CXXFLAGS}|g" \ |
| 36 |
+ -e "/.*,--version-script=.*/s|$| ${LDFLAGS} ${LIBS}|g" \ |
| 37 |
+ -e "/\$(CC)/s|\(\$(SHARED)\)|\1 ${LDFLAGS} ${LIBS}|" \ |
| 38 |
+ -e 's|\(\$(CC)\)|\1 \$(CFLAGS)|g' \ |
| 39 |
-e "s/GIT_VERSION\s.=.*$/GIT_VERSION=${custom_libretro_commit_sha}/g" \ |
| 40 |
-i "${makefile}" || die "Failed to use custom cflags in ${makefile}" |
| 41 |
done |
Archives