| 1 |
commit: 2328f28b225d9b77711a08ef839a6084f17b834d |
| 2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 4 17:53:22 2022 +0000 |
| 4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 4 17:54:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2328f28b |
| 7 |
|
| 8 |
dev-lang/smlnj: replace sed delimeter |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/717016 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-lang/smlnj/smlnj-110.82.ebuild | 14 +++++++------- |
| 15 |
dev-lang/smlnj/smlnj-110.99.2.ebuild | 12 ++++++------ |
| 16 |
2 files changed, 13 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild |
| 19 |
index 68c776772b8d..6e3b7303f61c 100644 |
| 20 |
--- a/dev-lang/smlnj/smlnj-110.82.ebuild |
| 21 |
+++ b/dev-lang/smlnj/smlnj-110.82.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2021 Gentoo Authors |
| 24 |
+# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI="6" |
| 28 |
@@ -83,11 +83,11 @@ src_prepare() { |
| 29 |
epatch "${FILESDIR}/${PN}-110.82-pax-p3.patch" |
| 30 |
default |
| 31 |
for file in mk.*; do |
| 32 |
- sed -e "/^AS/s:as:$(tc-getAS):" \ |
| 33 |
- -e "/^CC/s:gcc:$(tc-getCC):" \ |
| 34 |
- -e "/^CPP/s:gcc:$(tc-getCC):" \ |
| 35 |
- -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \ |
| 36 |
- -e "/^PAXMARK/s:true:"$(usex pax-kernel "paxmark.sh" "true")":" \ |
| 37 |
+ sed -e "/^AS/s|as|$(tc-getAS)|" \ |
| 38 |
+ -e "/^CC/s|gcc|$(tc-getCC)|" \ |
| 39 |
+ -e "/^CPP/s|gcc|$(tc-getCC)|" \ |
| 40 |
+ -e "/^CFLAGS/{s|-O[0123s]|| ; s|=|= ${CFLAGS}|}" \ |
| 41 |
+ -e "/^PAXMARK/s|true|"$(usex pax-kernel "paxmark.sh" "true")"|" \ |
| 42 |
-i base/runtime/objs/${file} |
| 43 |
done |
| 44 |
} |
| 45 |
@@ -138,7 +138,7 @@ src_install() { |
| 46 |
DIR=/usr/${SUBDIR} |
| 47 |
for file in bin/{*,.*}; do |
| 48 |
[[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \ |
| 49 |
- -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" -i ${file} |
| 50 |
+ -e "s|${WORKDIR}|${EPREFIX}/${DIR}|" -i ${file} |
| 51 |
done |
| 52 |
dodir ${DIR}/bin |
| 53 |
exeinto ${DIR}/bin |
| 54 |
|
| 55 |
diff --git a/dev-lang/smlnj/smlnj-110.99.2.ebuild b/dev-lang/smlnj/smlnj-110.99.2.ebuild |
| 56 |
index 98c8b3ecdf06..247d06dc4ca7 100644 |
| 57 |
--- a/dev-lang/smlnj/smlnj-110.99.2.ebuild |
| 58 |
+++ b/dev-lang/smlnj/smlnj-110.99.2.ebuild |
| 59 |
@@ -1,4 +1,4 @@ |
| 60 |
-# Copyright 1999-2021 Gentoo Authors |
| 61 |
+# Copyright 1999-2022 Gentoo Authors |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
EAPI=8 |
| 65 |
@@ -84,10 +84,10 @@ src_prepare() { |
| 66 |
default |
| 67 |
|
| 68 |
# respect CC et al. (bug 243886) |
| 69 |
- sed -e "/^AS/s:as:$(tc-getAS):" \ |
| 70 |
- -e "/^CC/s:gcc:$(tc-getCC):" \ |
| 71 |
- -e "/^CPP/s:gcc:$(tc-getCC):" \ |
| 72 |
- -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \ |
| 73 |
+ sed -e "/^AS/s|as|$(tc-getAS)|" \ |
| 74 |
+ -e "/^CC/s|gcc|$(tc-getCC)|" \ |
| 75 |
+ -e "/^CPP/s|gcc|$(tc-getCC)|" \ |
| 76 |
+ -e "/^CFLAGS/{s|-O[0123s]|| ; s|=|= ${CFLAGS}|}" \ |
| 77 |
-i base/runtime/objs/mk.* || die |
| 78 |
|
| 79 |
sed -i "s|nm |$(tc-getNM) |g" config/chk-global-names.sh || die |
| 80 |
@@ -109,7 +109,7 @@ src_install() { |
| 81 |
for file in bin/{*,.*} ; do |
| 82 |
[[ -f ${file} ]] && |
| 83 |
sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \ |
| 84 |
- -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" \ |
| 85 |
+ -e "s|${WORKDIR}|${EPREFIX}/${DIR}|" \ |
| 86 |
-i ${file} |
| 87 |
done |
Archives