[gentoo-commits] proj/crossdev:master commit in: wrappers/, wrappers/etc/portage/

[gentoo-commits] proj/crossdev:master commit in: wrappers/, wrappers/etc/portage/

[Mike Frysinger]

commit:     a4ab14acf5522e3ced4d71d535657d6f241c23c0
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 03:08:43 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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 <vapier <AT> 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}/
 

[gentoo-commits] proj/crossdev:master commit in: wrappers/, wrappers/etc/portage/

[Mike Frysinger]

commit:     bf32d4ed37582c92624317f78c3cb011f019093c
Author:     Joakim Tjernlund <Joakim.Tjernlund <AT> transmode <DOT> se>
AuthorDate: Tue Dec 10 16:33:42 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 02:54:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=bf32d4ed

make.profile: move from /etc to /etc/portage

This is where make.profile belongs in current portage

---
 wrappers/Makefile           | 2 +-
 wrappers/etc/portage/bashrc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wrappers/Makefile b/wrappers/Makefile
index eaa4115..144ecc1 100644
--- a/wrappers/Makefile
+++ b/wrappers/Makefile
@@ -18,6 +18,6 @@ install:
 	sed -i -e s@__PREFIX__@$(PREFIX)@g $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper
 	sed -i -e s@__TOPDIR__@$(SITE)@g $(DESTDIR)/$(SITE)/config.site
 	mv $(DESTDIR)/$(SITE)/config.site $(DESTDIR)/$(PREFIX)/share/
-	ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)/$(PREFIX)/share/crossdev/etc/make.profile
+	ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)/$(PREFIX)/share/crossdev/etc/portage/make.profile
 
 .PHONY: all install

diff --git a/wrappers/etc/portage/bashrc b/wrappers/etc/portage/bashrc
index e78b634..4ca2768 100644
--- a/wrappers/etc/portage/bashrc
+++ b/wrappers/etc/portage/bashrc
@@ -1,4 +1,4 @@
-[[ $(basename $(readlink -f $PORTAGE_CONFIGROOT/etc/make.profile)) == "embedded" ]] && . ${PORTDIR}/profiles/base/profile.bashrc
+[[ $(basename $(readlink -f $PORTAGE_CONFIGROOT/etc/portage/make.profile)) == "embedded" ]] && . ${PORTDIR}/profiles/base/profile.bashrc
 
 post_src_install() {
 	[[ -d ${D} ]] || return 0