You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2014/04/15 21:13:10 UTC
[lucy-commits] [2/2] git commit: refs/heads/master - Adjust setup_clownfish_env.sh
for Perl build
Adjust setup_clownfish_env.sh for Perl build
Set PERL5LIB and C_INCLUDE_PATH (for XSBind.h).
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/7329c7ee
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/7329c7ee
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/7329c7ee
Branch: refs/heads/master
Commit: 7329c7ee812384fc2c64f63ecfa4f9335a115f76
Parents: 4087b61
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Mar 22 20:03:33 2014 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Tue Apr 15 20:54:45 2014 +0200
----------------------------------------------------------------------
devel/bin/setup_clownfish_env.sh | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/7329c7ee/devel/bin/setup_clownfish_env.sh
----------------------------------------------------------------------
diff --git a/devel/bin/setup_clownfish_env.sh b/devel/bin/setup_clownfish_env.sh
index 9f47ad8..2ec107d 100644
--- a/devel/bin/setup_clownfish_env.sh
+++ b/devel/bin/setup_clownfish_env.sh
@@ -56,15 +56,19 @@ then
return 1 2>/dev/null || exit 1
fi
-compiler_dir=$src_dir/compiler/c
-runtime_dir=$src_dir/runtime/c
-core_dir=$src_dir/runtime/core
+compiler_dir=$src_dir/compiler
+runtime_dir=$src_dir/runtime
-export PATH=`add_to_path "$PATH" "$compiler_dir"`
-export LIBRARY_PATH=`add_to_path "$LIBRARY_PATH" "$runtime_dir"`
-export CLOWNFISH_INCLUDE=`add_to_path "$CLOWNFISH_INCLUDE" "$core_dir"`
+export PATH=`add_to_path "$PATH" "$compiler_dir/c"`
+export C_INCLUDE_PATH=`add_to_path "$C_INCLUDE_PATH" "$runtime_dir/perl/xs"`
+export LIBRARY_PATH=`add_to_path "$LIBRARY_PATH" "$runtime_dir/c"`
+export CLOWNFISH_INCLUDE=`add_to_path "$CLOWNFISH_INCLUDE" "$runtime_dir/core"`
+export PERL5LIB=`add_to_path "$PERL5LIB" "$compiler_dir/perl/blib/arch"`
+export PERL5LIB=`add_to_path "$PERL5LIB" "$compiler_dir/perl/blib/lib"`
+export PERL5LIB=`add_to_path "$PERL5LIB" "$runtime_dir/perl/blib/arch"`
+export PERL5LIB=`add_to_path "$PERL5LIB" "$runtime_dir/perl/blib/lib"`
if [ `uname` != Darwin ]; then
- export LD_LIBRARY_PATH=`add_to_path "$LD_LIBRARY_PATH" "$runtime_dir"`
+ export LD_LIBRARY_PATH=`add_to_path "$LD_LIBRARY_PATH" "$runtime_dir/c"`
fi