From a4ab14acf5522e3ced4d71d535657d6f241c23c0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 22 Dec 2013 22:08:43 -0500 Subject: wrappers: drop custom bashrc/e_machine logic Cross-compiling logic has largely stabilized enough now that we don't need this post-install hack to keep things sane. Plus, if you install a package that doesn't cross-compile properly, you'll notice pretty quickly. Signed-off-by: Mike Frysinger --- wrappers/emerge-wrapper | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'wrappers/emerge-wrapper') diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index 9a85f05..4658b5f 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -46,17 +46,6 @@ cross_wrap_etc() ) [[ ${ARCH} == "unknown" ]] && emit_setup_warning - # Now map out the non-standard EM values - case ${ARCH} in - amd64) E_MACHINE=X86_64 ;; - hppa) E_MACHINE=PARISC ;; - ia64) E_MACHINE=IA_64 ;; - m68k) E_MACHINE=68K ;; - x86) E_MACHINE=386 ;; - *) E_MACHINE=`echo ${ARCH} | tr '[:lower:]' '[:upper:]'` ;; - esac - E_MACHINE="EM_${E_MACHINE}" - LIBC="__LIBC__" case ${CHOST} in *gnu*) LIBC=glibc ;; @@ -66,13 +55,10 @@ cross_wrap_etc() sed -i \ -e "s:__LIBC__:${LIBC}:g" \ - -e "s:__E_MACHINE__:${E_MACHINE}:g" \ -e "s:__ARCH__:${ARCH}:g" \ -e "s:__CHOST__:${CHOST}:g" \ -e "s:__CBUILD__:${CBUILD}:g" \ "${conf}" - [[ ${EM_MACHINE} == "EM_UNKNOWN" ]] \ - && sed -i '/^E_MACHINE/s:^:#:' "${conf}" # Merge UCLIBC_CPU from env only local v -- cgit v1.2.3-18-g5258