From b703ab87eb0e9bd41bc190f703b07db7b30bcbbd Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Wed, 29 Jan 2014 17:47:29 +0100 Subject: [PATCH 1/2] Move ARCH and ELIBC to local profile As both ARCH and ELIBC are PROFILE_ONLY vars one cannot define these in make.conf. Move these to etc/portage/profile/make.defaults which is part of the profile. Signed-off-by: Joakim Tjernlund --- wrappers/emerge-wrapper | 4 ++++ wrappers/etc/portage/make.conf | 5 +---- wrappers/etc/portage/profile/make.defaults | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 wrappers/etc/portage/profile/make.defaults diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index 7bcbcf0..df8b39a 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -68,6 +68,10 @@ cross_wrap_etc() egrep '/(linux-headers|glibc|musl|newlib|uclibc)-' | \ sed "s:^[^/]*:sys-libs:" \ > profile/package.provided + sed -i \ + -e "s:__LIBC__:${LIBC}:g" \ + -e "s:__ARCH__:${ARCH}:g" \ + profile/make.defaults return 0 } diff --git a/wrappers/etc/portage/make.conf b/wrappers/etc/portage/make.conf index 65214dc..cec2ebb 100644 --- a/wrappers/etc/portage/make.conf +++ b/wrappers/etc/portage/make.conf @@ -1,12 +1,11 @@ CHOST=__CHOST__ CBUILD=__CBUILD__ -ARCH=__ARCH__ HOSTCC=__CBUILD__-gcc ROOT=/usr/${CHOST}/ -ACCEPT_KEYWORDS="__ARCH__ ~__ARCH__" +ACCEPT_KEYWORDS="${ARCH} ~${ARCH}" USE="${ARCH} -pam" @@ -18,7 +17,5 @@ FEATURES="-collision-protect sandbox buildpkg noman noinfo nodoc" PKGDIR=${ROOT}packages/ PORTAGE_TMPDIR=${ROOT}tmp/ -ELIBC="__LIBC__" - PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/" #PORTDIR_OVERLAY="/usr/portage/local/" diff --git a/wrappers/etc/portage/profile/make.defaults b/wrappers/etc/portage/profile/make.defaults new file mode 100644 index 0000000..5ad9037 --- /dev/null +++ b/wrappers/etc/portage/profile/make.defaults @@ -0,0 +1,2 @@ +ARCH="__ARCH__" +ELIBC="__LIBC__" -- 1.8.5.5