From: "Amy Liffey" <amynka@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/fpc/
Date: Tue, 15 Aug 2017 11:38:07 +0000 (UTC) [thread overview]
Message-ID: <1502797015.944e17caad889864e4884040355e3fd98e74f7b7.amynka@gentoo> (raw)
commit: 944e17caad889864e4884040355e3fd98e74f7b7
Author: Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Mon Aug 14 17:33:17 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 11:36:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944e17ca
dev-lang/fpc: using ${ED} for prefix/RAP compatibility
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes:#5419
dev-lang/fpc/fpc-3.0.2.ebuild | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/dev-lang/fpc/fpc-3.0.2.ebuild b/dev-lang/fpc/fpc-3.0.2.ebuild
index 41b229acda5..f8ea1b5b8b4 100644
--- a/dev-lang/fpc/fpc-3.0.2.ebuild
+++ b/dev-lang/fpc/fpc-3.0.2.ebuild
@@ -107,10 +107,10 @@ src_install() {
#${WORKDIR}/${PN}build-${PV}/utils/fpcm/fpcmake"
#fpcbuild-3.0.0/fpcsrc/utils/fpcm/bin/x86_64-linux/fpcmake
set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/bin/${FPC_PARCH}-linux/fpcmake" \
- INSTALL_PREFIX="${D}"/usr \
- INSTALL_DOCDIR="${D}"/usr/share/doc/${PF} \
- INSTALL_MANDIR="${D}"/usr/share/man \
- INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source
+ INSTALL_PREFIX="${ED}"/usr \
+ INSTALL_DOCDIR="${ED}"/usr/share/doc/${PF} \
+ INSTALL_MANDIR="${ED}"/usr/share/man \
+ INSTALL_SOURCEDIR="${ED}"/usr/lib/fpc/${PV}/source
emake -j1 "$@" compiler_install rtl_install packages_install utils_install
@@ -135,23 +135,23 @@ src_install() {
if use source ; then
cd "${S}" || die
shift
- emake -j1 PP="${D}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall
- find "${D}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \;
+ emake -j1 PP="${ED}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall
+ find "${ED}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \;
fi
- "${D}"/usr/lib/fpc/${PV}/samplecfg "${D}"/usr/lib/fpc/${PV} "${D}"/etc || die
+ "${ED}"/usr/lib/fpc/${PV}/samplecfg "${ED}"/usr/lib/fpc/${PV} "${ED}"/etc || die
- sed -i "s:${D}::g" "${D}"/etc/fpc.cfg || die
+ sed -i "s:${ED}::g" "${ED}"/etc/fpc.cfg || die
if use ide ; then
- sed -e "s:${D}::g" \
- -i "${D}"/etc/fppkg.cfg \
- -i "${D}"/etc/fppkg/* \
- -i "${D}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \
+ sed -e "s:${ED}::g" \
+ -i "${ED}"/etc/fppkg.cfg \
+ -i "${ED}"/etc/fppkg/* \
+ -i "${ED}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \
|| die
fi
- rm -r "${D}"/usr/lib/fpc/lexyacc || die
+ rm -r "${ED}"/usr/lib/fpc/lexyacc || die
}
pkg_postinst() {
next reply other threads:[~2017-08-15 11:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-15 11:38 Amy Liffey [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-23 12:57 [gentoo-commits] repo/gentoo:master commit in: dev-lang/fpc/ Jakov Smolić
2021-10-23 12:43 Jakov Smolić
2021-10-17 1:04 Sam James
2021-10-16 7:11 Agostino Sarubbo
2021-10-16 7:10 Agostino Sarubbo
2021-07-25 1:13 Sam James
2021-07-25 1:10 Sam James
2021-06-30 21:56 Ionen Wolkens
2021-06-22 20:44 David Seifert
2020-12-02 0:32 Aaron Bauman
2019-12-15 12:48 Agostino Sarubbo
2019-12-15 12:44 Agostino Sarubbo
2018-03-17 6:45 Matt Turner
2018-01-21 14:05 Amy Liffey
2017-08-25 11:46 Amy Liffey
2017-08-11 12:45 Amy Liffey
2017-04-02 14:24 Amy Liffey
2016-03-14 12:35 Amy Winston
2016-03-14 12:35 Amy Winston
2016-02-25 13:59 Justin Lecher
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=1502797015.944e17caad889864e4884040355e3fd98e74f7b7.amynka@gentoo \
--to=amynka@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