From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CA7601387B1 for ; Mon, 23 Dec 2013 03:11:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE7F3E0AF1; Mon, 23 Dec 2013 03:11:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 185D8E0AF1 for ; Mon, 23 Dec 2013 03:11:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1732E33F54D for ; Mon, 23 Dec 2013 03:11:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4D8D3E5540 for ; Mon, 23 Dec 2013 03:11:04 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1387768123.a4ab14acf5522e3ced4d71d535657d6f241c23c0.vapier@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/, wrappers/etc/portage/ X-VCS-Repository: proj/crossdev X-VCS-Files: wrappers/emerge-wrapper wrappers/etc/portage/bashrc wrappers/etc/portage/make.conf X-VCS-Directories: wrappers/ wrappers/etc/portage/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: a4ab14acf5522e3ced4d71d535657d6f241c23c0 X-VCS-Branch: master Date: Mon, 23 Dec 2013 03:11:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 24162331-3f3f-4b82-9165-d1724c1b971d X-Archives-Hash: 59611164a7f4b5f61dcad960ba9f37d6 commit: a4ab14acf5522e3ced4d71d535657d6f241c23c0 Author: Mike Frysinger gentoo org> AuthorDate: Mon Dec 23 03:08:43 2013 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Dec 23 03:08:43 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=a4ab14ac 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 gentoo.org> --- wrappers/emerge-wrapper | 14 -------------- wrappers/etc/portage/bashrc | 20 -------------------- wrappers/etc/portage/make.conf | 1 - 3 files changed, 35 deletions(-) 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 diff --git a/wrappers/etc/portage/bashrc b/wrappers/etc/portage/bashrc deleted file mode 100644 index 4ca2768..0000000 --- a/wrappers/etc/portage/bashrc +++ /dev/null @@ -1,20 +0,0 @@ -[[ $(basename $(readlink -f $PORTAGE_CONFIGROOT/etc/portage/make.profile)) == "embedded" ]] && . ${PORTDIR}/profiles/base/profile.bashrc - -post_src_install() { - [[ -d ${D} ]] || return 0 - [[ ${E_MACHINE} == "" ]] && return 0 - cmdline="" - for EM in $E_MACHINE; do - cmdline+=" -e ^${EM}[[:space:]]"; - done - output="$( cd ${D} && scanelf -RmyBF%a . | grep -v ${cmdline} )" - [[ $output != "" ]] && { echo; echo "* Wrong EM_TYPE. Expected ${E_MACHINE}"; echo -e "${output}"; echo; exit 1; } -} - -# We don't run this on the assumption that when you're -# emerging binary packages, it's into a runtime ROOT -# rather than build development ROOT. The former doesn't -# want hacking while the latter does. -if [[ $EBUILD_PHASE == "postinst" ]]; then - [[ $SYSROOT == $ROOT ]] && cross-fix-root ${CHOST} -fi diff --git a/wrappers/etc/portage/make.conf b/wrappers/etc/portage/make.conf index 82e489b..6c1ffbd 100644 --- a/wrappers/etc/portage/make.conf +++ b/wrappers/etc/portage/make.conf @@ -3,7 +3,6 @@ CBUILD=__CBUILD__ ARCH=__ARCH__ HOSTCC=__CBUILD__-gcc -E_MACHINE=__E_MACHINE__ ROOT=/usr/${CHOST}/