From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/
Date: Tue, 4 Jan 2022 17:54:36 +0000 (UTC) [thread overview]
Message-ID: <1641318873.2328f28b225d9b77711a08ef839a6084f17b834d.xgqt@gentoo> (raw)
commit: 2328f28b225d9b77711a08ef839a6084f17b834d
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 17:53:22 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 17:54:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2328f28b
dev-lang/smlnj: replace sed delimeter
Closes: https://bugs.gentoo.org/717016
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/smlnj/smlnj-110.82.ebuild | 14 +++++++-------
dev-lang/smlnj/smlnj-110.99.2.ebuild | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild
index 68c776772b8d..6e3b7303f61c 100644
--- a/dev-lang/smlnj/smlnj-110.82.ebuild
+++ b/dev-lang/smlnj/smlnj-110.82.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -83,11 +83,11 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-110.82-pax-p3.patch"
default
for file in mk.*; do
- sed -e "/^AS/s:as:$(tc-getAS):" \
- -e "/^CC/s:gcc:$(tc-getCC):" \
- -e "/^CPP/s:gcc:$(tc-getCC):" \
- -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \
- -e "/^PAXMARK/s:true:"$(usex pax-kernel "paxmark.sh" "true")":" \
+ sed -e "/^AS/s|as|$(tc-getAS)|" \
+ -e "/^CC/s|gcc|$(tc-getCC)|" \
+ -e "/^CPP/s|gcc|$(tc-getCC)|" \
+ -e "/^CFLAGS/{s|-O[0123s]|| ; s|=|= ${CFLAGS}|}" \
+ -e "/^PAXMARK/s|true|"$(usex pax-kernel "paxmark.sh" "true")"|" \
-i base/runtime/objs/${file}
done
}
@@ -138,7 +138,7 @@ src_install() {
DIR=/usr/${SUBDIR}
for file in bin/{*,.*}; do
[[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \
- -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" -i ${file}
+ -e "s|${WORKDIR}|${EPREFIX}/${DIR}|" -i ${file}
done
dodir ${DIR}/bin
exeinto ${DIR}/bin
diff --git a/dev-lang/smlnj/smlnj-110.99.2.ebuild b/dev-lang/smlnj/smlnj-110.99.2.ebuild
index 98c8b3ecdf06..247d06dc4ca7 100644
--- a/dev-lang/smlnj/smlnj-110.99.2.ebuild
+++ b/dev-lang/smlnj/smlnj-110.99.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -84,10 +84,10 @@ src_prepare() {
default
# respect CC et al. (bug 243886)
- sed -e "/^AS/s:as:$(tc-getAS):" \
- -e "/^CC/s:gcc:$(tc-getCC):" \
- -e "/^CPP/s:gcc:$(tc-getCC):" \
- -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \
+ sed -e "/^AS/s|as|$(tc-getAS)|" \
+ -e "/^CC/s|gcc|$(tc-getCC)|" \
+ -e "/^CPP/s|gcc|$(tc-getCC)|" \
+ -e "/^CFLAGS/{s|-O[0123s]|| ; s|=|= ${CFLAGS}|}" \
-i base/runtime/objs/mk.* || die
sed -i "s|nm |$(tc-getNM) |g" config/chk-global-names.sh || die
@@ -109,7 +109,7 @@ src_install() {
for file in bin/{*,.*} ; do
[[ -f ${file} ]] &&
sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \
- -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" \
+ -e "s|${WORKDIR}|${EPREFIX}/${DIR}|" \
-i ${file}
done
next reply other threads:[~2022-01-04 17:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-04 17:54 Maciej Barć [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-14 23:40 [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/ Maciej Barć
2024-11-14 23:40 Maciej Barć
2024-05-26 21:36 Maciej Barć
2024-05-26 21:36 Maciej Barć
2023-08-05 16:53 Maciej Barć
2022-07-29 10:19 Maciej Barć
2022-06-27 23:41 Maciej Barć
2022-03-19 11:57 Maciej Barć
2022-03-18 9:31 Maciej Barć
2022-03-18 8:38 Maciej Barć
2021-12-02 21:43 Maciej Barć
2021-12-02 0:02 Maciej Barć
2021-12-01 21:11 Maciej Barć
2021-12-01 21:11 Maciej Barć
2019-12-15 13:37 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1641318873.2328f28b225d9b77711a08ef839a6084f17b834d.xgqt@gentoo \
--to=xgqt@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox