From interchange-cvs at icdevgroup.org  Sat Jul  4 13:41:49 2015
From: interchange-cvs at icdevgroup.org (Stefan Hornburg)
Date: Sat, 04 Jul 2015 13:41:49 +0000
Subject: [interchange] Add architecture dependent library directory to @INC
	for "Require module Foo /home/bar/lib" directiv
Message-ID: <E1ZBNhV-0000wK-F8@elmo.icdevgroup.org>

commit 5e314b094965ad0b40bc4bb1dcf80821d4e45bd7
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Sat Jul 4 15:40:53 2015 +0200

    Add architecture dependent library directory to @INC for "Require module Foo /home/bar/lib" directive.

 lib/Vend/Config.pm |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/lib/Vend/Config.pm b/lib/Vend/Config.pm
index fbc6e0b..30d2500 100644
--- a/lib/Vend/Config.pm
+++ b/lib/Vend/Config.pm
@@ -44,6 +44,7 @@ use vars qw(
 			$GlobalRead  $SystemCodeDone $SystemGroupsDone $CodeDest
 			$SystemReposDone $ReposDest @include
 			);
+use Config;
 use Vend::Safe;
 use Fcntl;
 use Vend::Parse;
@@ -2781,11 +2782,13 @@ sub parse_require {
 			if($perlglobal) {
 				if ($pathinfo) {
 					unshift(@INC, $pathinfo);
+					unshift(@INC, "$pathinfo/$Config{archname}");
 				}
 				eval "require $module$oldtype;";
 				my $error = $@;
 				if ($pathinfo) {
 					shift(@INC);
+					shift(@INC);
 				}
 				::logGlobal("while eval'ing module %s got [%s]\n", $module, $error) if $error;
 				return ! $error;