From 7cae558c82e46ebda5cdc56b2a6d891766a95494 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 9 Dec 2009 17:47:34 -0500
Subject: crossdev: let people make their own cross dirs

URL: http://bugs.gentoo.org/211386
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 crossdev | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'crossdev')

diff --git a/crossdev b/crossdev
index 2252716..50d955a 100755
--- a/crossdev
+++ b/crossdev
@@ -542,16 +542,22 @@ set_use() {
 }
 set_links() {
 	local cat=$1 pkg=$2
-	local s srcdir=${PORTDIR}
-	rm -f "${PORTDIR_OVERLAY}"/cross-${CTARGET}/${pkg}
-	for s in ${PORTDIR_OVERLAYS} ; do
-		if [[ -d ${s}/${cat}/${pkg} ]] ; then
-			einfo "Using ${cat}/${pkg} from ${s} instead of ${PORTDIR}"
-			srcdir=${s}
-			break
-		fi
-	done
-	ln -s "${srcdir}"/${cat}/${pkg} "${PORTDIR_OVERLAY}"/cross-${CTARGET}/${pkg}
+	local s srcdir=${PORTDIR} d
+
+	d="${PORTDIR_OVERLAY}"/cross-${CTARGET}/${pkg}
+	if [[ ! -L ${d} && -d ${d} ]] ; then #211386
+		einfo "Leaving existing dir alone: ${d}"
+	else
+		rm -f "${d}"
+		for s in ${PORTDIR_OVERLAYS} ; do
+			if [[ -d ${s}/${cat}/${pkg} ]] ; then
+				einfo "Using ${cat}/${pkg} from ${s} instead of ${PORTDIR}"
+				srcdir=${s}
+				break
+			fi
+		done
+		ln -s "${srcdir}"/${cat}/${pkg} "${d}"
+	fi
 }
 set_portage() {
 	local cat=$1 pkg=$2 ver=$3
-- 
cgit v1.2.3-65-gdbad