Author: mturk
Date: Mon Sep 14 05:44:07 2009
New Revision: 814477
URL: http://svn.apache.org/viewvc?rev=814477&view=rev
Log:
Use $ORIGIN instead . for linux"
"
Modified:
commons/sandbox/runtime/trunk/src/main/native/configure
commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=814477&r1=814476&r2=814477&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Sep 14 05:44:07
2009
@@ -393,7 +393,7 @@
varadds ccflags -fPIC -O3 -Wall -g
varadds ldflags -lrt -lpthread -ldl
varadds shflags -shared -fPIC -Wl,-soname '-Wl,??@'
- varadds exflags '-Wl,-rpath -Wl,??(PREFIX)/??(LIBDIR):.'
+ varadds exflags '-Wl,-rpath,??(PREFIX)/??(LIBDIR):????ORIGIN'
test ".$java_pinc" = . && java_pinc=linux
;;
linux-cc )
@@ -416,7 +416,7 @@
varadds cppopts -DDARWIN=$r
varadds ccflags -fPIC -O3 -g
varadds ldflags -lpthread -ldl
- varadds exflags '-Wl,-rpath -Wl,??(PREFIX)/??(LIBDIR):.'
+ varadds exflags '-Wl,-rpath,??(PREFIX)/??(LIBDIR):.'
if [ ".$has_jni" = .yes ]; then so=".jnilib"; else so=".dynlib"; fi
varadds shflags -dynamiclib -flat_namespace -undefined suppress -fPIC
-Wl,-dylib_install_name '-Wl,??@'
;;
@@ -613,7 +613,7 @@
if [ ".$host" = .windows ]; then
co="`$cc $ccflags $cppopts $test.c /link /out:$test$exe 2>&1`"
else
- co="`$cc $ccflags $cppopts $test.c -o $test$exe 2>&1`"
+ co="`$cc $ccflags $cppopts $test.c -o $test$exe 2>&1`"
fi
if [ ".$co" = "." ]; then
rc=1
@@ -648,7 +648,7 @@
if [ ".$host" = .windows ]; then
co="`$cc $ccflags $cppopts $test.c /link /out:$test$exe $1 2>&1`"
else
- co="`$cc $ccflags $cppopts $test.c -o $test$exe -l$1 2>&1`"
+ co="`$cc $ccflags $cppopts $test.c -o $test$exe -l$1 2>&1`"
fi
if [ ".$co" = "." ]; then
rc=1
@@ -684,7 +684,7 @@
if [ ".$host" = .windows ]; then
co="`$cc $ccflags $cppopts $ldflags $test.c /link /out:$test$exe 2>&1`"
else
- co="`$cc $ccflags $cppopts $ldflags $test.c -o $test$exe 2>&1`"
+ co="`$cc $ccflags $cppopts $ldflags $test.c -o $test$exe 2>&1`"
fi
if [ ".$co" = . ]; then
rc=1
@@ -730,7 +730,7 @@
if [ ".$host" = .windows ]; then
co="`$cc $ccflags $cppopts $test.c /link /out:$test$exe 2>&1`"
else
- co="`$cc $ccflags $cppopts $test.c -o $test$exe 2>&1`"
+ co="`$cc $ccflags $cppopts $test.c -o $test$exe 2>&1`"
fi
if [ ".$co" = . ]; then
rc=1
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c?rev=814477&r1=814476&r2=814477&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c Mon Sep 14
05:44:07 2009
@@ -194,5 +194,3 @@
return tlsd->env;
}
-
-
