| 1 |
As both ARCH and ELIBC are PROFILE_ONLY vars one cannot |
| 2 |
define these in make.conf. |
| 3 |
Move these to etc/portage/profile/make.defaults which is part |
| 4 |
of the profile. |
| 5 |
--- |
| 6 |
|
| 7 |
This is an idea I am contemplating. How does crossdev |
| 8 |
like to have profile data in etc/portage/profile/make.default? |
| 9 |
|
| 10 |
Also, the use of __ARCH__ and ${ARCH} in make.conf is inconsistent, |
| 11 |
switched to ${ARCH} but I am unsue if this is the way to go. |
| 12 |
|
| 13 |
Oh, this is not tested(yet)! |
| 14 |
|
| 15 |
wrappers/emerge-wrapper | 4 ++++ |
| 16 |
wrappers/etc/portage/make.conf | 5 +---- |
| 17 |
wrappers/etc/portage/profile/make.defaults | 2 ++ |
| 18 |
3 files changed, 7 insertions(+), 4 deletions(-) |
| 19 |
create mode 100644 wrappers/etc/portage/profile/make.defaults |
| 20 |
|
| 21 |
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper |
| 22 |
index 7bcbcf0..df8b39a 100755 |
| 23 |
--- a/wrappers/emerge-wrapper |
| 24 |
+++ b/wrappers/emerge-wrapper |
| 25 |
@@ -68,6 +68,10 @@ cross_wrap_etc() |
| 26 |
egrep '/(linux-headers|glibc|musl|newlib|uclibc)-' | \ |
| 27 |
sed "s:^[^/]*:sys-libs:" \ |
| 28 |
> profile/package.provided |
| 29 |
+ sed -i \ |
| 30 |
+ -e "s:__LIBC__:${LIBC}:g" \ |
| 31 |
+ -e "s:__ARCH__:${ARCH}:g" \ |
| 32 |
+ profile/make.defaults |
| 33 |
|
| 34 |
return 0 |
| 35 |
} |
| 36 |
diff --git a/wrappers/etc/portage/make.conf b/wrappers/etc/portage/make.conf |
| 37 |
index 65214dc..cec2ebb 100644 |
| 38 |
--- a/wrappers/etc/portage/make.conf |
| 39 |
+++ b/wrappers/etc/portage/make.conf |
| 40 |
@@ -1,12 +1,11 @@ |
| 41 |
CHOST=__CHOST__ |
| 42 |
CBUILD=__CBUILD__ |
| 43 |
-ARCH=__ARCH__ |
| 44 |
|
| 45 |
HOSTCC=__CBUILD__-gcc |
| 46 |
|
| 47 |
ROOT=/usr/${CHOST}/ |
| 48 |
|
| 49 |
-ACCEPT_KEYWORDS="__ARCH__ ~__ARCH__" |
| 50 |
+ACCEPT_KEYWORDS="${ARCH} ~${ARCH}" |
| 51 |
|
| 52 |
USE="${ARCH} -pam" |
| 53 |
|
| 54 |
@@ -18,7 +17,5 @@ FEATURES="-collision-protect sandbox buildpkg noman noinfo nodoc" |
| 55 |
PKGDIR=${ROOT}packages/ |
| 56 |
PORTAGE_TMPDIR=${ROOT}tmp/ |
| 57 |
|
| 58 |
-ELIBC="__LIBC__" |
| 59 |
- |
| 60 |
PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/" |
| 61 |
#PORTDIR_OVERLAY="/usr/portage/local/" |
| 62 |
diff --git a/wrappers/etc/portage/profile/make.defaults b/wrappers/etc/portage/profile/make.defaults |
| 63 |
new file mode 100644 |
| 64 |
index 0000000..5ad9037 |
| 65 |
--- /dev/null |
| 66 |
+++ b/wrappers/etc/portage/profile/make.defaults |
| 67 |
@@ -0,0 +1,2 @@ |
| 68 |
+ARCH="__ARCH__" |
| 69 |
+ELIBC="__LIBC__" |
| 70 |
-- |
| 71 |
1.8.3.2 |
Archives