From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/
Date: Mon, 23 Dec 2013 03:06:26 +0000 (UTC) [thread overview]
Message-ID: <1387767963.ef372284c03b42c6c7f0c48a56c925e6c8abd9a8.vapier@gentoo> (raw)
commit: ef372284c03b42c6c7f0c48a56c925e6c8abd9a8
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 03:06:03 2013 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 03:06:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=ef372284
emerge-wrapper: drop "wrap all targets" logic
We don't really need to do this anymore as crossdev will initialize things
automatically for you now.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
wrappers/emerge-wrapper | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index be81f95..9a85f05 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -86,12 +86,15 @@ cross_wrap_etc()
cross_wrap_bin()
{
[[ $1 == "-q" ]] || echo "${CHOST}: Setting up symlinks"
+
+ pushd "${0%/*}" >/dev/null
local wrapper
for wrapper in emerge fix-root pkg-config ; do
ln -sf cross-${wrapper} ${CHOST}-${wrapper}
done
# some people like their tab completion
ln -sf cross-emerge emerge-${CHOST}
+ popd >/dev/null
}
cross_wrap()
@@ -106,26 +109,13 @@ cross_wrap()
cross_init()
{
- cd "${0%/*}" || err "unable to cd to ${0%/*}"
+ if [[ ${CHOST} == "wrapper" ]] ; then
+ err "missing --target <CHOST> option"
+ fi
# Initialize env for just one target. This is the automated behavior
# when crossdev is setting things up for people.
- if [[ ${CHOST} != "wrapper" ]] ; then
- cross_wrap -q
- return $?
- fi
-
- # When called generically, blindly set up wrappers for all installed
- # toolchains. This is more historical behavior and not really
- # recommended anymore ...
- [[ ${0##*/} != emerge-wrapper ]] && err "I wont understand things"
-
- for CHOST in `find /usr/lib/gcc -maxdepth 1 -mindepth 1 -type d` ; do
- CHOST=${CHOST##*/}
- [[ ${CHOST} == ${CBUILD} ]] && continue
- type -P -- ${CHOST}-gcc >/dev/null || continue
- cross_wrap
- done
+ cross_wrap -q
}
# CBUILD must be the first thing we export, but might as well avoid
next reply other threads:[~2013-12-23 3:06 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-23 3:06 Mike Frysinger [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-22 8:35 [gentoo-commits] proj/crossdev:master commit in: wrappers/ James Le Cuirot
2024-05-04 11:58 Sam James
2024-01-08 14:28 Sam James
2023-10-15 4:23 Matt Turner
2023-09-23 12:56 Sam James
2023-06-16 20:21 Mike Gilbert
2022-12-27 16:06 Sam James
2022-08-18 21:57 Sam James
2022-08-18 21:57 Sam James
2022-01-13 8:20 Mike Frysinger
2022-01-13 8:20 Mike Frysinger
2021-11-26 19:02 Mike Frysinger
2021-10-27 8:55 Mike Frysinger
2021-06-21 21:23 Sergei Trofimovich
2021-01-17 8:09 Sergei Trofimovich
2019-08-30 7:32 Sergei Trofimovich
2019-07-21 13:41 James Le Cuirot
2019-07-12 7:24 Sergei Trofimovich
2019-03-18 22:54 Sergei Trofimovich
2019-03-11 22:13 Sergei Trofimovich
2018-10-20 20:08 Sergei Trofimovich
2018-04-05 6:56 Sergei Trofimovich
2018-03-24 15:13 Sergei Trofimovich
2018-03-10 13:07 Sergei Trofimovich
2017-12-30 22:37 Sergei Trofimovich
2017-12-30 17:45 Sergei Trofimovich
2016-01-16 8:22 Mike Frysinger
2015-07-23 3:47 Mike Frysinger
2014-10-31 1:56 Mike Frysinger
2014-10-31 1:56 Mike Frysinger
2014-10-31 0:52 Mike Frysinger
2014-09-18 16:52 Mike Frysinger
2014-09-17 21:41 Mike Frysinger
2014-09-17 21:41 Mike Frysinger
2014-07-29 6:07 ` Mike Frysinger
2014-09-17 21:41 Mike Frysinger
2014-07-29 6:07 ` Mike Frysinger
2014-03-27 6:43 Mike Frysinger
2014-01-18 19:37 Mike Frysinger
2013-01-28 22:51 Mike Frysinger
2012-02-27 23:13 Mike Frysinger
2011-10-18 17:36 Mike Frysinger
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=1387767963.ef372284c03b42c6c7f0c48a56c925e6c8abd9a8.vapier@gentoo \
--to=vapier@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