* [gentoo-commits] proj/crossdev:master commit in: /, wrappers/
@ 2013-12-23 3:11 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2013-12-23 3:11 UTC (permalink / raw
To: gentoo-commits
commit: ffccaa9cd610d9c7a3c778a4b560dfbd3ebca386
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 03:10:24 2013 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 03:10:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=ffccaa9c
wrappers: drop UCLIBC_CPU support
We've deleted most of this from the uclibc ebuilds and have been pushing
people to use CFLAGS for optimization selection. Drop the logic from
here too.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
crossdev | 5 +----
wrappers/emerge-wrapper | 6 ------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/crossdev b/crossdev
index a4ff901..b0f5ab7 100755
--- a/crossdev
+++ b/crossdev
@@ -636,7 +636,7 @@ if [[ ${HCHOST} == "${CTARGET}" ]] ; then
fi
# grab user settings
-for v in MULTILIB_ABIS UCLIBC_CPU USE BVER GVER KVER LVER STAGE CFLAGS LDFLAGS ASFLAGS ; do
+for v in MULTILIB_ABIS USE BVER GVER KVER LVER STAGE CFLAGS LDFLAGS ASFLAGS ; do
d="${CONFIGROOT}/crossdev/${CTARGET}"
if [[ -e ${d}/${v} ]] ; then
# yes, quotes are needed in this instance (export $var="...")
@@ -1102,9 +1102,6 @@ export FEATURES="${FEATURES} -stricter"
# maybe someday this work, but that day != today
USE="${USE} -selinux"
-# only allow UCLIBC_CPU from env, not from make.conf/profile
-export UCLIBC_CPU=${UCLIBC_CPU}
-
if ! ex_fast ; then
# stage 0: binutils
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index 4658b5f..545e8c2 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -60,12 +60,6 @@ cross_wrap_etc()
-e "s:__CBUILD__:${CBUILD}:g" \
"${conf}"
- # Merge UCLIBC_CPU from env only
- local v
- for v in ${import_vars} UCLIBC_CPU ; do
- [[ -n ${!v} ]] && echo "${v}=\"${!v}\""
- done >> "${conf}"
-
return 0
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/crossdev:master commit in: /, wrappers/
@ 2014-09-17 21:41 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2014-09-17 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 622535d24325820a5d042b16ebcd1a57b11cd802
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 17 21:20:40 2014 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 17 21:20:40 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=622535d2
switch from PORTDIR/PORTDIR_OVERLAY to repositories_configuration
URL: https://bugs.gentoo.org/520880
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
crossdev | 78 ++++++++++++++++++++++++++++++++++++-------------
wrappers/emerge-wrapper | 19 ++++++++++--
2 files changed, 74 insertions(+), 23 deletions(-)
diff --git a/crossdev b/crossdev
index 29fe431..164c2ea 100755
--- a/crossdev
+++ b/crossdev
@@ -7,7 +7,8 @@ CROSSDEV_VER="@CDEVPV@"
cd /
umask 0022 #159111
-if [[ ${ROOT:-/} != "/" ]] ; then
+: ${ROOT:=/}
+if [[ ${ROOT} != "/" ]] ; then
echo "Sorry, but crossdev does not support ROOT." 1>&2
exit 2
fi
@@ -60,7 +61,7 @@ Options:
Overlay Options:
${GOOD}-oS, --overlays${NORMAL} list Space delimited list of overlays to search
- [default: \${PORTDIR_OVERLAY}]
+ [default: \`portageq repositories_configuration\`]
${GOOD}-oO, --ov-output${NORMAL} path Overlay to write crossdev package links
[default: uses repo with name 'crossdev', or
'cross-\${CTARGET}', or falls back to first
@@ -308,11 +309,56 @@ parse_target() {
esac
}
+parse_repo_config() {
+ # Ugh, ini parser here we come.
+ # [DEFAULT]
+ # main-repo = gentoo
+ # [crossdev]
+ # location = /usr/local/portage
+ # masters = gentoo
+ # priority = 0
+ local repo_config=$(portageq repositories_configuration "${ROOT}")
+ local flat_config=$(echo "${repo_config}" | gawk '
+ {
+ if ($1 == "main-repo") {
+ main_repo = $NF
+ } else if ($1 ~ /^\[/) {
+ if (repo_name && loc)
+ repos[prio] = repo_name ":" loc
+ repo_name = gensub(/\[([^\]]*)\]/, "\\1", "", $1)
+ loc = prio = ""
+ } else if ($1 == "priority") {
+ prio = $3
+ } else if ($1 == "location") {
+ loc = $3
+ }
+ }
+ END {
+ repos[prio] = repo_name ":" loc
+
+ print(main_repo)
+ asorti(repos, prios)
+ for (prio in prios)
+ print(repos[prios[prio]])
+ }
+ ')
+
+ MAIN_REPO_NAME=$(echo "${flat_config}" | head -1)
+ REPO_CONFIG=$(echo "${flat_config}" | sed 1d)
+ MAIN_REPO_PATH=$(echo "${REPO_CONFIG}" | sed -n "/^${MAIN_REPO_NAME}:/s,^[^:]*:,,p")
+ if [[ -z ${SEARCH_OVERLAYS} ]] ; then
+ # see if user gave us an overlay search list, otherwise
+ # default to whatever is configured in portage
+ SEARCH_OVERLAYS=$(echo "${REPO_CONFIG}" | sed -e "/^${MAIN_REPO_NAME}:/d" -e 's,^[^:]*:,,')
+ fi
+}
+
setup_portage_vars() {
local arch=${ARCH} arch_set=${ARCH+set}
local chost=${CHOST} chost_set=${CHOST+set}
unset ARCH CHOST
- eval $(portageq envvar -v PORTDIR_OVERLAY PORTDIR PORT_LOGDIR PORTAGE_TMPDIR ARCH CHOST)
+ eval $(portageq envvar -v PORT_LOGDIR PORTAGE_TMPDIR ARCH CHOST)
+ parse_repo_config
# keep the original values, but be aware of the native ones
HARCH=${ARCH}
@@ -320,24 +366,20 @@ setup_portage_vars() {
HCHOST=${CHOST}
[[ ${chost_set} == "set" ]] && CHOST=${chost} || unset CHOST
- # see if user gave us an overlay search list, otherwise
- # default to whatever is configured in portage
- : ${SEARCH_OVERLAYS:=${PORTDIR_OVERLAY}}
-
# see if user told us where to write things, otherwise
# set up some repos.conf magic if possible. if not,
# install our stuff to the first overlay in the list.
if [[ -z ${CROSSDEV_OVERLAY} ]] ; then
- CROSSDEV_OVERLAY=${SEARCH_OVERLAYS%% *}
-
local repo
for repo in "cross-${CTARGET}" crossdev ; do
- repo=$(portageq get_repo_path / "${repo}")
+ repo=$(echo "${REPO_CONFIG}" | sed -n "/^${repo}:/s,^[^:]*:,,p")
if [[ -n ${repo} ]] ; then
CROSSDEV_OVERLAY=${repo}
break
fi
done
+
+ : ${CROSSDEV_OVERLAY:=$(echo "${SEARCH_OVERLAYS}" | head -1)}
fi
# make sure we have a valid logdir
@@ -626,8 +668,8 @@ show_target_cfg() {
setup_portage_vars
if [[ -z ${CROSSDEV_OVERLAY} ]] ; then
- eerror "You need to specify an output overlay. Please use --ov-output or set"
- eerror "PORTDIR_OVERLAY in your make.conf. A standard setting is: /usr/local/portage"
+ eerror "You need to specify an output overlay. Please use --ov-output, or consult"
+ eerror "https://wiki.gentoo.org/wiki/Overlay/Local_overlay for more details."
exit 1
fi
@@ -663,7 +705,7 @@ multilib_env() {
# ask multilib.eclass to tell us how things work
inherit() { :; }
- for p in ${SEARCH_OVERLAYS} ${PORTDIR} ; do
+ for p in ${SEARCH_OVERLAYS} ${MAIN_REPO_PATH} ; do
p+="/eclass/multilib.eclass"
if [[ -e ${p} ]] ; then
. "${p}"
@@ -832,7 +874,7 @@ set_use_mask() {
}
set_links() {
local cat=$1 pkg=$2 ovl=$3
- local s srcdir=${PORTDIR} d
+ local s srcdir=${MAIN_REPO_PATH} d
d="${CROSSDEV_OVERLAY}"/cross-${CTARGET}/${pkg}
# if auto searching and something is already set, leave it be
@@ -952,7 +994,7 @@ set_metadata() {
fi
# build up a list of possible repos where we can pull from
- for d in "${BOVL}" "${GOVL}" "${KOVL}" "${LOVL}" ${SEARCH_OVERLAYS} "${PORTDIR}" ; do
+ for d in "${BOVL}" "${GOVL}" "${KOVL}" "${LOVL}" ${SEARCH_OVERLAYS} "${MAIN_REPO_PATH}" ; do
[[ -z ${d} ]] && continue
name=
@@ -1090,12 +1132,6 @@ doemerge() {
eend 0
}
-# Make this "just work" rather than worrying about user not putting
-# this overlay path into their system settings already.
-if [[ -n ${CROSSDEV_OVERLAY} ]] ; then
- export PORTDIR_OVERLAY="${CROSSDEV_OVERLAY} ${PORTDIR_OVERLAY}"
-fi
-
# We include the '-u' so that we don't re-emerge packages. Avoid
# using --nodeps as packages have more host depends nowadays (like
# gcc wanting updated mpfr/gmp). Don't use --oneshot anymore to
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index 7bcbcf0..154d82e 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -41,7 +41,7 @@ cross_wrap_etc()
# Re-use existing CHOST->portage ARCH mapping code
ARCH=$(
inherit() { :; }
- . "${PORTDIR}"/eclass/toolchain-funcs.eclass
+ . "${MAIN_REPO_PATH}"/eclass/toolchain-funcs.eclass
tc-arch
)
[[ ${ARCH} == "unknown" ]] && emit_setup_warning
@@ -109,10 +109,25 @@ cross_init()
# CBUILD must be the first thing we export, but might as well avoid
# running portageq multiple times ...
-import_vars="PORTDIR DISTDIR PORTDIR_OVERLAY MAKEOPTS GENTOO_MIRRORS"
+import_vars="DISTDIR MAKEOPTS GENTOO_MIRRORS"
eval $(portageq envvar -v CBUILD ${import_vars})
export CBUILD
+# Probably shouldn't hardcode "gentoo" here.
+MAIN_REPO_PATH=$(portageq repositories_configuration / | gawk '
+ {
+ if ($1 == "main-repo") {
+ main_repo = $NF
+ } else if ($1 ~ /^\[/) {
+ locs[repo_name] = loc
+ repo_name = gensub(/\[([^\]]*)\]/, "\\1", "", $1)
+ } else if ($1 == "location") {
+ loc = $3
+ }
+ }
+ END { print(locs[main_repo]) }
+')
+
# Get default CHOST value from program name
CHOST=${0##*/}
CHOST=${CHOST%-emerge}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/crossdev:master commit in: /, wrappers/
@ 2015-05-18 15:55 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2015-05-18 15:55 UTC (permalink / raw
To: gentoo-commits
commit: ed6c54d9c660286fb1d0620e4c7f7ff00b642b57
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 15:52:12 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon May 18 15:53:41 2015 +0000
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=ed6c54d9
crossdev/emerge-wrapper: merge repos.conf parsers
The crossdev code had a more full-featured parser of the repos.conf output
than the emerge-wrapper. The latter failed to include the last overlay in
the list leading to ugly warnings like:
/usr/bin/emerge-wrapper: line 48: /eclass/toolchain-funcs.eclass: No such file or directory
/usr/bin/emerge-wrapper: line 49: tc-arch: command not found
URL: https://bugs.gentoo.org/546748
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
crossdev | 10 ++++++++++
wrappers/emerge-wrapper | 15 +--------------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/crossdev b/crossdev
index 62b6c3d..0691641 100755
--- a/crossdev
+++ b/crossdev
@@ -351,6 +351,15 @@ parse_repo_config() {
fi
}
+# Used by --show-repo-cfg to share the parser logic with other tools.
+show_repo_cfg() {
+ local var=$1
+ unset SEARCH_OVERLAYS
+ parse_repo_config
+ echo "${!var}"
+ exit 0
+}
+
setup_portage_vars() {
local arch=${ARCH} arch_set=${ARCH+set}
local chost=${CHOST} chost_set=${CHOST+set}
@@ -602,6 +611,7 @@ while [[ $# -gt 0 ]] ; do
--show-target-cfg) SHOW_TARGET_CFG="yes";;
--init-target) INIT_TARGET_ONLY="yes";;
--show-fail-log) SHOW_FAIL_LOG="yes";;
+ --show-repo-cfg) show_repo_cfg "$2";;
-P|--portage) UOPTS="${UOPTS} $2"; shift;;
-b|-d|-p|-v|-q) UOPTS="${UOPTS} $1";;
-pv|-vp) UOPTS="${UOPTS} -p -v";;
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index 4056601..e375025 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -116,20 +116,7 @@ import_vars="DISTDIR MAKEOPTS GENTOO_MIRRORS"
eval $(portageq envvar -v CBUILD ${import_vars})
export CBUILD
-# Probably shouldn't hardcode "gentoo" here.
-MAIN_REPO_PATH=$(portageq repositories_configuration / | gawk '
- {
- if ($1 == "main-repo") {
- main_repo = $NF
- } else if ($1 ~ /^\[/) {
- locs[repo_name] = loc
- repo_name = gensub(/\[([^\]]*)\]/, "\\1", "", $1)
- } else if ($1 == "location") {
- loc = $3
- }
- }
- END { print(locs[main_repo]) }
-')
+MAIN_REPO_PATH=$(crossdev --show-repo-cfg MAIN_REPO_PATH)
# Get default CHOST value from program name
CHOST=${0##*/}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/crossdev:master commit in: /, wrappers/
@ 2018-10-20 20:08 Sergei Trofimovich
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2018-10-20 20:08 UTC (permalink / raw
To: gentoo-commits
commit: d292392962718567fc3d6931b1cd2e544b9d179e
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 18:39:41 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 18:39:41 2018 +0000
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=d2923929
Makefile: mangle files with sed at install phase
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Makefile | 3 +--
wrappers/Makefile | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 26c5b37..40e45ee 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,11 @@
include settings.mk
all:
- sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" crossdev
- $(MAKE) -C wrappers
install:
$(INSTALL_DIR) $(DESTDIR)/$(PREFIX)/bin/
$(INSTALL_EXEC) crossdev $(DESTDIR)/$(PREFIX)/bin/
+ sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" $(DESTDIR)/$(PREFIX)/bin/crossdev
$(MAKE) -C wrappers install
PV = $(shell test -e .git && date --date="`git log -1 --format=%ci`" +%Y%m%d)
diff --git a/wrappers/Makefile b/wrappers/Makefile
index edb6a26..24880f7 100644
--- a/wrappers/Makefile
+++ b/wrappers/Makefile
@@ -8,14 +8,14 @@ FNAMES = cross-emerge cross-fix-root cross-pkg-config emerge-wrapper
SITE = $(PREFIX)/share/crossdev/include/site
all:
- sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" cross-emerge
- sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" emerge-wrapper
- sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" etc/portage/make.conf
install:
$(INSTALL_DIR) $(DESTDIR)/$(PREFIX)/bin/ $(DESTDIR)/$(SITE)
$(INSTALL_EXEC) $(FNAMES) $(DESTDIR)/$(PREFIX)/bin/
+ sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" $(DESTDIR)/$(PREFIX)/bin/cross-emerge
+ sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper
cp -a etc $(DESTDIR)/$(PREFIX)/share/crossdev/
+ sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" $(DESTDIR)/$(PREFIX)/share/crossdev/etc/portage/make.conf
cp -a site $(DESTDIR)/$(PREFIX)/share/crossdev/include/
sed -i -e s@__PREFIX__@$(PREFIX)@g $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper
sed -i -e s@__TOPDIR__@$(SITE)@g $(DESTDIR)/$(SITE)/config.site
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/crossdev:master commit in: /, wrappers/
@ 2018-10-20 20:08 Sergei Trofimovich
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2018-10-20 20:08 UTC (permalink / raw
To: gentoo-commits
commit: ef839047331b1fa2b44472e522235350e6cfe28c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 19:06:56 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 19:06:56 2018 +0000
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=ef839047
Makefile: avoid '//' when PREFIX is not set
PREFIX assumes leading '/'. Thus the idiom is
$(DESTDIR)$(PREFIX)/foo
and not
$(DESTDIR)/$(PREFIX)/foo
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Makefile | 6 +++---
wrappers/Makefile | 22 +++++++++++-----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 7814eaf..aa07a91 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@ include settings.mk
all:
install:
- $(INSTALL_DIR) $(DESTDIR)/$(PREFIX)/bin/
- $(INSTALL_EXEC) crossdev $(DESTDIR)/$(PREFIX)/bin/
- sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)/$(PREFIX)/bin/crossdev
+ $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/
+ $(INSTALL_EXEC) crossdev $(DESTDIR)$(PREFIX)/bin/
+ sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)$(PREFIX)/bin/crossdev
$(MAKE) -C wrappers install
PV = $(shell test -e .git && date --date="`git log -1 --format=%ci`" +%Y%m%d)
diff --git a/wrappers/Makefile b/wrappers/Makefile
index 73f0dcc..7cbe72f 100644
--- a/wrappers/Makefile
+++ b/wrappers/Makefile
@@ -10,16 +10,16 @@ SITE = $(PREFIX)/share/crossdev/include/site
all:
install:
- $(INSTALL_DIR) $(DESTDIR)/$(PREFIX)/bin/ $(DESTDIR)/$(SITE)
- $(INSTALL_EXEC) $(FNAMES) $(DESTDIR)/$(PREFIX)/bin/
- sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)/$(PREFIX)/bin/cross-emerge
- sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper
- cp -a etc $(DESTDIR)/$(PREFIX)/share/crossdev/
- sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)/$(PREFIX)/share/crossdev/etc/portage/make.conf
- cp -a site $(DESTDIR)/$(PREFIX)/share/crossdev/include/
- sed -i -e s:@PREFIX@:$(PREFIX):g $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper
- sed -i -e s:@TOPDIR@:$(SITE):g $(DESTDIR)/$(SITE)/config.site
- mv $(DESTDIR)/$(SITE)/config.site $(DESTDIR)/$(PREFIX)/share/
- ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)/$(PREFIX)/share/crossdev/etc/portage/make.profile
+ $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(SITE)
+ $(INSTALL_EXEC) $(FNAMES) $(DESTDIR)$(PREFIX)/bin/
+ sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)$(PREFIX)/bin/cross-emerge
+ sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)$(PREFIX)/bin/emerge-wrapper
+ cp -a etc $(DESTDIR)$(PREFIX)/share/crossdev/
+ sed -i -e "s:@GENTOO_PORTAGE_EPREFIX@:$(EPREFIX):g" $(DESTDIR)$(PREFIX)/share/crossdev/etc/portage/make.conf
+ cp -a site $(DESTDIR)$(PREFIX)/share/crossdev/include/
+ sed -i -e s:@PREFIX@:$(PREFIX):g $(DESTDIR)$(PREFIX)/bin/emerge-wrapper
+ sed -i -e s:@TOPDIR@:$(SITE):g $(DESTDIR)$(SITE)/config.site
+ mv $(DESTDIR)$(SITE)/config.site $(DESTDIR)$(PREFIX)/share/
+ ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)$(PREFIX)/share/crossdev/etc/portage/make.profile
.PHONY: all install
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/crossdev:master commit in: /, wrappers/
@ 2018-12-02 12:35 Sergei Trofimovich
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2018-12-02 12:35 UTC (permalink / raw
To: gentoo-commits
commit: c0c4e4355bf59cf04d35c6eb6e331b9118267113
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 12:34:41 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 12:34:41 2018 +0000
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=c0c4e435
Switch from sys-libs/uclibc to sys-libs/uclibc-ng package.
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
crossdev | 4 ++--
wrappers/emerge-wrapper | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/crossdev b/crossdev
index 915ffc0..d38b0e7 100755
--- a/crossdev
+++ b/crossdev
@@ -308,8 +308,8 @@ parse_target() {
*-dietlibc) LPKG="dietlibc"; LCAT="dev-libs";;
*-gnu*) LPKG="glibc";;
*-klibc) LPKG="klibc";;
- *-uclibc*) LPKG="uclibc";;
- *-uclinux) LPKG="uclibc";;
+ *-uclibc*) LPKG="uclibc-ng";;
+ *-uclinux) LPKG="uclibc-ng";;
*-musl*) LPKG="musl";;
# Windows targets
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index fc53f2a..d554eba 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -55,7 +55,7 @@ cross_wrap_etc()
LIBC="__LIBC__"
case ${CHOST} in
*gnu*) LIBC=glibc ;;
- *uclibc*) LIBC=uclibc ;;
+ *uclibc*) LIBC=uclibc-ng ;;
*musl*) LIBC=musl ;;
*cygwin*) LIBC=Cygwin ;;
*mingw*) LIBC=mingw ;;
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/crossdev:master commit in: /, wrappers/
@ 2021-06-21 21:23 Sergei Trofimovich
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2021-06-21 21:23 UTC (permalink / raw
To: gentoo-commits
commit: b40ebcdb89f19d2fd0c563590f30d7574cfe0755
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 13:30:46 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 21:04:16 2021 +0000
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=b40ebcdb
crossdev, emerge-wrapper: request EAPI=7 on eclass imports
Today ::gentoo dropped support for EAPI=0 from multilib.eclass
and toolchain-funcs.eclass. Due to lack of error handling on
crossdev side srossdev derived wrong environment for $CTARGET
(and mostly fell back to CHOST).
This caused at best failing early on gcc-stage1 build. At worst
crossdev installed libraries into a wrong $(get_libdir), installed
symlinks from wrong host and other disasters.
Previous crossdev commits make crossdev crash earlier instead of
generating wrong environment. This commit allows dropping EAI=0
support for eclasses eventually.
Reported-by: Marco Scardovi (scardracs)
Bug: https://bugs.gentoo.org/797367
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
crossdev | 2 +-
wrappers/emerge-wrapper | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/crossdev b/crossdev
index 619603f..57ffbb5 100755
--- a/crossdev
+++ b/crossdev
@@ -983,7 +983,7 @@ load_multilib_env() {
for p in ${SEARCH_OVERLAYS} ${MAIN_REPO_PATH} ; do
p+="/eclass/multilib.eclass"
if [[ -e ${p} ]] ; then
- . "${p}"
+ EAPI=7 . "${p}"
break
fi
done
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index d9ba08b..d8c6537 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -48,7 +48,7 @@ cross_wrap_etc()
ARCH=$(
inherit() { :; }
die() { err "toolchain-funcs.eclass$*"; }
- . "${MAIN_REPO_PATH}"/eclass/toolchain-funcs.eclass
+ EAPI=7 . "${MAIN_REPO_PATH}"/eclass/toolchain-funcs.eclass
tc-arch
)
[[ $? -ne 0 ]] && err "Failed calling 'tc-arch' from toolchain-funcs.eclass."
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-06-21 21:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-18 15:55 [gentoo-commits] proj/crossdev:master commit in: /, wrappers/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2021-06-21 21:23 Sergei Trofimovich
2018-12-02 12:35 Sergei Trofimovich
2018-10-20 20:08 Sergei Trofimovich
2018-10-20 20:08 Sergei Trofimovich
2014-09-17 21:41 Mike Frysinger
2013-12-23 3:11 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox