[gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass

[Mike Frysinger (vapier)]

vapier      12/11/02 16:38:47

  Modified:             emul-linux-x86.eclass
  Log:
  do not try to move /lib32 if it does not exist #429726

Revision  Changes    Path
1.14                 eclass/emul-linux-x86.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.13&r2=1.14

Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- emul-linux-x86.eclass	28 Oct 2012 09:43:49 -0000	1.13
+++ emul-linux-x86.eclass	2 Nov 2012 16:38:46 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.13 2012/10/28 09:43:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.14 2012/11/02 16:38:46 vapier Exp $
 
 #
 # Original Author: Mike Doty <kingtaco@g.o>
@@ -82,6 +82,8 @@
 	if [[ ${x86_libdir} != "lib32" ]] ; then
 		ewarn "Moving lib32/ to ${x86_libdir}/; some libs might not work"
 		mv "${D}"/usr/lib32 "${D}"/usr/${x86_libdir} || die
-		mv "${D}"/lib32 "${D}"/${x86_libdir} || die
+		if [[ -d ${D}/lib32 ]] ; then
+			mv "${D}"/lib32 "${D}"/${x86_libdir} || die
+		fi
 	fi
 }