[Bps-public-commit] r10111 - bpsbuilder/BPB/lib/BPB

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Tue Dec 25 00:30:33 2007
New Revision: 10111

Modified:
   bpsbuilder/BPB/lib/BPB/Backend.pm

Log:
wrapper need to set PERL5LIB, added LD_LIBRARY_PATH for builder too

Modified: bpsbuilder/BPB/lib/BPB/Backend.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Backend.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Backend.pm	Tue Dec 25 00:30:33 2007
@@ -44,7 +44,9 @@
 BASE_DIR=` (cd "$BASE_DIR"; pwd) `
 FILENAME=`basename "$BASE"`
 WRAPPED_DIR=`basename "$BASE_DIR"`
-LD_LIBRARY_PATH=${BASE_DIR}/../lib:${LD_LIBRARY_PATH}\
+ARCHNAME=`/usr/bin/perl -MConfig -e 'print $Config{archname}'`
+PERL5LIB=${BASE_DIR}/../lib:${BASE_DIR}/../lib/${ARCHNAME}:${PERL5LIB}\
+    LD_LIBRARY_PATH=${BASE_DIR}/../lib:${LD_LIBRARY_PATH}\
     DYLD_LIBRARY_PATH=${BASE_DIR}/../lib:${DYLD_LIBRARY_PATH}\
     exec ${BASE_DIR}/../${WRAPPED_DIR}-wrapped/${FILENAME}  "$@"
 EOF
@@ -72,7 +74,10 @@
 }
 
 $args{perl} ||= 'perl';
-$ENV{DYLD_LIBRARY_PATH} = File::Spec->catfile( $args{'install-base'}, 'lib' );
+$ENV{DYLD_LIBRARY_PATH} = File::Spec->catfile( $args{'install-base'}, 'lib' )
+    . ':' . $ENV{DYLD_LIBRARY_PATH};
+$ENV{LD_LIBRARY_PATH} = File::Spec->catfile( $args{'install-base'}, 'lib' ) .
+    ':' . $ENV{LD_LIBRARY_PATH};
 
 mkdir $args{'install-base'} unless -e $args{'install-base'};