diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2023-06-16 14:17:34 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2023-06-16 14:17:34 -0400 |
| commit | 54839f5869b46c727c43f247e421b1f9e32704d4 (patch) | |
| tree | e8e106f7d0a673d7b86f1c00483e8a23ffcbf9dc | |
| parent | crossdev: initial nvptx-none porting (diff) | |
| download | crossdev-54839f5869b46c727c43f247e421b1f9e32704d4.tar.gz crossdev-54839f5869b46c727c43f247e421b1f9e32704d4.tar.bz2 crossdev-54839f5869b46c727c43f247e421b1f9e32704d4.zip | |
Avoid calling portageq from Makefile20230616
It is probably better to look up the repo path at runtime anyway.
Bug: https://bugs.gentoo.org/908602
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | wrappers/Makefile | 4 | ||||
| -rwxr-xr-x | wrappers/emerge-wrapper | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/wrappers/Makefile b/wrappers/Makefile index 031f099..a55c2bc 100644 --- a/wrappers/Makefile +++ b/wrappers/Makefile @@ -1,9 +1,8 @@ -# Copyright 2008-2010 Gentoo Foundation +# Copyright 2008-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 include ../settings.mk -PORTDIR ?= $(shell portageq envvar PORTDIR) FNAMES = cross-ebuild cross-emerge cross-fix-root cross-pkg-config emerge-wrapper SITEDIR = $(PREFIX)/share/crossdev/include/site ETC_SITEDIR = $(EPREFIX)/etc/crossdev/include/site @@ -24,6 +23,5 @@ install: sed -i -e s:@SITEDIR@:$(SITEDIR):g $(DESTDIR)$(SITEDIR)/config.site sed -i -e s:@ETC_SITEDIR@:$(ETC_SITEDIR):g $(DESTDIR)$(SITEDIR)/config.site mv $(DESTDIR)$(SITEDIR)/config.site $(DESTDIR)$(PREFIX)/share/ - ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)$(PREFIX)/share/crossdev/etc/portage/make.profile .PHONY: all install diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index 051948a..87dcb00 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2008-2010 Gentoo Foundation +# Copyright 2008-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 if [[ $1 == "--help" || $1 == "-h" ]] ; then @@ -37,6 +37,7 @@ cross_wrap_etc() setup_warning=false cp -a "${PREFIX}"/share/crossdev/etc ${SYSROOT}/ || return 1 + ln -snf "${MAIN_REPO_PATH}/profiles/embedded" "${SYSROOT}/etc/portage/make.profile" || return 1 local confs=( ${SYSROOT}/etc/portage/make.conf |