build: Use global RPATH value

Also introduce ORIGIN for crosscompiler.

RPATH can be convenient to avoid developer to deal with environment variables
(LD_LIBRARY_PATH or PATH on windows), as we're using them for now.

In longer term, this can be replaced by relative pathes,
once the installation process is fixed
(at least on systems supporting ORIGIN).

It was tested on yocto poky master.

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ibaabc31b8dc744267e4c6c1c682d2090da9ada96
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/21589/

diff --git a/bridging/common/SConscript b/bridging/common/SConscript
index 51fc27a..0befd5e 100644 (file)
--- a/bridging/common/SConscript
+++ b/bridging/common/SConscript
@@ -57,7 +57,6 @@ if target_os not in ['arduino', 'windows']:
     mpmcommon_env.AppendUnique(
         CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror', '-fpic'])
 
-mpmcommon_env.AppendUnique(RPATH=[mpmcommon_env.get('BUILD_DIR')])
 mpmcommon_env['LINKFLAGS'] = maskFlags(mpmcommon_env['LINKFLAGS'])
 
 mpmcommon_env.PrependUnique(LIBS=[

diff --git a/bridging/mini_plugin_manager/SConscript b/bridging/mini_plugin_manager/SConscript
index 58a1f49..23aba98 100644 (file)
--- a/bridging/mini_plugin_manager/SConscript
+++ b/bridging/mini_plugin_manager/SConscript
@@ -48,7 +48,6 @@ manager_env.PrependUnique(CPPPATH=[
 if target_os not in ['arduino', 'windows']:
         manager_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
 
-manager_env.AppendUnique(RPATH=[manager_env.get('BUILD_DIR')])
 manager_env.PrependUnique(LIBS=['mpmcommon'])
 
 #####################################################################

diff --git a/bridging/mpm_client/SConscript b/bridging/mpm_client/SConscript
index ebc3420..0b98b42 100644 (file)
--- a/bridging/mpm_client/SConscript
+++ b/bridging/mpm_client/SConscript
@@ -48,8 +48,6 @@ mpmclient_env.AppendUnique(LIBS=['pthread'])
 mpmclient_env.AppendUnique(LIBS=[
     'm', 'octbstack', 'ocsrm', 'mpmcommon', 'connectivity_abstraction', 'coap', 'curl'
 ])
-mpmclient_env.AppendUnique(
-    RPATH=[os.path.join(env.get('BUILD_DIR'), 'bridging', 'plugins')])
 
 if target_os in ['linux', 'tizen', 'yocto']:
     mpmclient_env.AppendUnique(LIBS = ['rt'])

diff --git a/bridging/plugins/hue_plugin/SConscript b/bridging/plugins/hue_plugin/SConscript
index 6cd4557..1278949 100644 (file)
--- a/bridging/plugins/hue_plugin/SConscript
+++ b/bridging/plugins/hue_plugin/SConscript
@@ -69,7 +69,6 @@ if target_os in ['darwin', 'ios']:
     hue_env.AppendUnique(CPPDEFINES=['_DARWIN_C_SOURCE'])
 
 hue_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
-hue_env.AppendUnique(RPATH=[hue_env.get('BUILD_DIR')])
 
 if hue_env.get('LOGGING'):
     hue_env.AppendUnique(CPPDEFINES=['TB_LOG'])

diff --git a/bridging/plugins/lifx_plugin/SConscript b/bridging/plugins/lifx_plugin/SConscript
index d012dbc..849a54a 100644 (file)
--- a/bridging/plugins/lifx_plugin/SConscript
+++ b/bridging/plugins/lifx_plugin/SConscript
@@ -65,8 +65,6 @@ if 'g++' in lifx_env.get('CXX'):
     lifx_env.AppendUnique(
         CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
 
-lifx_env.AppendUnique(RPATH=[lifx_env.get('BUILD_DIR')])
-
 lifx_env['LINKFLAGS'] = maskFlags(env['LINKFLAGS'])
 lifx_env.AppendUnique(LINKFLAGS=['-Wl,--allow-shlib-undefined'])
 lifx_env.AppendUnique(LINKFLAGS=[

diff --git a/bridging/plugins/lyric_plugin/SConscript b/bridging/plugins/lyric_plugin/SConscript
index b1bff08..ed87192 100644 (file)
--- a/bridging/plugins/lyric_plugin/SConscript
+++ b/bridging/plugins/lyric_plugin/SConscript
@@ -67,8 +67,6 @@ if 'g++' in lyric_env.get('CXX'):
     lyric_env.AppendUnique(
         CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
 
-lyric_env.AppendUnique(RPATH=[lyric_env.get('BUILD_DIR')])
-
 lyric_env['LINKFLAGS'] = maskFlags(env['LINKFLAGS'])
 lyric_env.AppendUnique(LINKFLAGS=['-Wl,--allow-shlib-undefined'])
 lyric_env.AppendUnique(LINKFLAGS=[

diff --git a/bridging/plugins/nest_plugin/SConscript b/bridging/plugins/nest_plugin/SConscript
index d977583..866d51d 100644 (file)
--- a/bridging/plugins/nest_plugin/SConscript
+++ b/bridging/plugins/nest_plugin/SConscript
@@ -72,8 +72,6 @@ if 'g++' in nest_env.get('CXX'):
     nest_env.AppendUnique(
         CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
 
-nest_env.AppendUnique(RPATH=[nest_env.get('BUILD_DIR')])
-
 if nest_env.get('LOGGING'):
     nest_env.AppendUnique(CPPDEFINES=['TB_LOG'])
 

diff --git a/build_common/SConscript b/build_common/SConscript
index 0f286bf..79c6c1f 100755 (executable)
--- a/build_common/SConscript
+++ b/build_common/SConscript
@@ -596,7 +596,6 @@ rd_mode = env.get('RD_MODE')
 with_ra_ibb = env.get('WITH_RA_IBB')
 
 env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
 
 if (env.get('WITH_UPSTREAM_LIBCOAP') == '1'):
     env.AppendUnique(CPPDEFINES=['WITH_UPSTREAM_LIBCOAP'])
@@ -788,6 +787,11 @@ else:
     # Load config of target os
     env.SConscript(target_os + '/SConscript')
 
+if env.get('CROSS_COMPILE'):
+    env.Append(RPATH=env.Literal('\\$$ORIGIN'))
+else:
+    env.Append(RPATH=env.get('BUILD_DIR'))
+
 # Delete the temp files of configuration
 if env.GetOption('clean'):
     dir = env.get('SRC_DIR')

diff --git a/plugins/samples/linux/SConscript b/plugins/samples/linux/SConscript
index 302737b..e57f9a9 100644 (file)
--- a/plugins/samples/linux/SConscript
+++ b/plugins/samples/linux/SConscript
@@ -40,7 +40,6 @@ samples_env.PrependUnique(CPPPATH=[
 
 samples_env.AppendUnique(
     CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
-samples_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 
 if target_os in ['darwin', 'ios']:
     samples_env.PrependUnique(

diff --git a/plugins/src/SConscript b/plugins/src/SConscript
index 0b61819..0dad475 100644 (file)
--- a/plugins/src/SConscript
+++ b/plugins/src/SConscript
@@ -67,7 +67,6 @@ if target_os in ['darwin', 'ios']:
     env.AppendUnique(CPPDEFINES=['_DARWIN_C_SOURCE'])
 
 env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
-env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 
 env.PrependUnique(LIBS=['zigbee_wrapper'])
 

diff --git a/plugins/zigbee_wrapper/src/SConscript b/plugins/zigbee_wrapper/src/SConscript
index 6ddc5a2..4ab95dd 100644 (file)
--- a/plugins/zigbee_wrapper/src/SConscript
+++ b/plugins/zigbee_wrapper/src/SConscript
@@ -59,8 +59,6 @@ if target_os in ['darwin', 'ios']:
     env.AppendUnique(CPPDEFINES=['_DARWIN_C_SOURCE'])
 
 env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall', '-Wextra', '-Werror'])
-env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
-
 env.PrependUnique(LIBS=['telegesis_wrapper'])
 
 #####################################################################

diff --git a/resource/csdk/resource-directory/SConscript b/resource/csdk/resource-directory/SConscript
index a6af7da..f28a5f3 100644 (file)
--- a/resource/csdk/resource-directory/SConscript
+++ b/resource/csdk/resource-directory/SConscript
@@ -53,8 +53,6 @@ if 'CLIENT' in rd_mode:
 if 'SERVER' in rd_mode:
     rd_env.AppendUnique(CPPDEFINES=['RD_SERVER'])
 
-if target_os != 'android':
-    rd_env.PrependUnique(RPATH=[rd_env.get('BUILD_DIR')])
 rd_env.PrependUnique(
     LIBS=['octbstack', 'oc', 'oc_logger', 'connectivity_abstraction'])
 

diff --git a/resource/csdk/resource-directory/samples/SConscript b/resource/csdk/resource-directory/samples/SConscript
index 4f54eb3..d11f317 100644 (file)
--- a/resource/csdk/resource-directory/samples/SConscript
+++ b/resource/csdk/resource-directory/samples/SConscript
@@ -47,7 +47,6 @@ rd_sample_app_env.AppendUnique(CPPPATH=[
 if target_os not in ['windows']:
     rd_sample_app_env.AppendUnique(
         CXXFLAGS=['-O2', '-g', '-Wall', '-Wextra', '-std=c++0x'])
-rd_sample_app_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 rd_sample_app_env.PrependUnique(LIBS=['resource_directory', 'octbstack'])
 
 if env.get('SECURED') == '1':

diff --git a/resource/csdk/resource-directory/unittests/SConscript b/resource/csdk/resource-directory/unittests/SConscript
index 44570b0..edf60f1 100644 (file)
--- a/resource/csdk/resource-directory/unittests/SConscript
+++ b/resource/csdk/resource-directory/unittests/SConscript
@@ -73,7 +73,6 @@ rd_test_env.AppendUnique(CPPPATH=[
     src_dir + '/resource/oc_logger/include',
 ])
 
-rd_test_env.AppendUnique(RPATH=[lib_env.get('BUILD_DIR')])
 rd_test_env.PrependUnique(LIBS=['octbstack'])
 
 if rd_test_env.get('RD_MODE'):

diff --git a/resource/csdk/security/provisioning/sample/SConscript b/resource/csdk/security/provisioning/sample/SConscript
index 1d73608..e4d707d 100644 (file)
--- a/resource/csdk/security/provisioning/sample/SConscript
+++ b/resource/csdk/security/provisioning/sample/SConscript
@@ -35,7 +35,6 @@ provisioning_sample_env.AppendUnique(CPPPATH=[
 ])
 
 target_os = env.get('TARGET_OS')
-provisioning_sample_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
 provisioning_sample_env.AppendUnique(CPPDEFINES=['__WITH_DTLS__'])
 
 if target_os not in ['windows']:

diff --git a/resource/csdk/security/tool/SConscript b/resource/csdk/security/tool/SConscript
index 39f01ae..db7e835 100644 (file)
--- a/resource/csdk/security/tool/SConscript
+++ b/resource/csdk/security/tool/SConscript
@@ -49,7 +49,6 @@ tools_env.PrependUnique(CPPPATH=[
     '#/resource/csdk/security/provisioning/include/internal'
 ])
 tools_env.AppendUnique(CXXFLAGS=['-O2', '-g', '-Wall', '-Wextra', '-std=c++0x'])
-tools_env.AppendUnique(RPATH=[tools_env.get('BUILD_DIR')])
 
 if target_os in ['windows', 'msys_nt']:
     # Macro needed for Windows builds to avoid __declspec(dllexport) and

diff --git a/resource/csdk/stack/SConscript b/resource/csdk/stack/SConscript
index 70ffb07..e027f27 100644 (file)
--- a/resource/csdk/stack/SConscript
+++ b/resource/csdk/stack/SConscript
@@ -96,7 +96,7 @@ if target_os not in ['windows']:
 liboctbstack_env.PrependUnique(LIBS=['ocsrm', 'coap'])
 
 if target_os in ['linux'] and liboctbstack_env.get('SIMULATOR', False):
-    liboctbstack_env.Append(RPATH=liboctbstack_env.Literal('\\$$ORIGIN'))
+    liboctbstack_env['RPATH']=liboctbstack_env.Literal('\\$$ORIGIN')
 
 if env.get('SECURED') == '1':
     liboctbstack_env.AppendUnique(LIBS=['mbedtls', 'mbedx509'])

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
index d8feaa6..27130a3 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
@@ -49,8 +49,6 @@ compiler = samples_env.get('CXX')
 if 'g++' in compiler:
     samples_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall'])
 
-samples_env.AppendUnique(RPATH=[samples_env.get('BUILD_DIR')])
-
 samples_env.PrependUnique(LIBS=['coap'])
 
 if target_os not in ['msys_nt', 'windows']:

diff --git a/resource/provisioning/examples/SConscript b/resource/provisioning/examples/SConscript
index 9a29891..cc505a5 100644 (file)
--- a/resource/provisioning/examples/SConscript
+++ b/resource/provisioning/examples/SConscript
@@ -56,7 +56,6 @@ examples_env.AppendUnique(CPPPATH=[
     '../../csdk/security/provisioning/include/internal'
 ])
 
-examples_env.AppendUnique(RPATH=[examples_env.get('BUILD_DIR')])
 examples_env.PrependUnique(LIBS=[
     'ocprovision',
     'oc',

diff --git a/resource/src/SConscript b/resource/src/SConscript
index c74feda..e5d6366 100644 (file)
--- a/resource/src/SConscript
+++ b/resource/src/SConscript
@@ -83,7 +83,7 @@ if target_os in ['linux', 'tizen']:
     oclib_env.ParseConfig('pkg-config --cflags --libs sqlite3')
 
 if target_os in ['linux'] and oclib_env.get('SIMULATOR', False):
-    oclib_env.Append(RPATH=oclib_env.Literal('\\$$ORIGIN'))
+    oclib_env['RPATH']=oclib_env.Literal('\\$$ORIGIN')
 
 if target_os in ['msys_nt', 'windows']:
     oclib_env.AppendUnique(LIBS=[

diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript
index d7848e8..b107e66 100644 (file)
--- a/service/easy-setup/enrollee/SConscript
+++ b/service/easy-setup/enrollee/SConscript
@@ -76,7 +76,6 @@ if not env.get('RELEASE'):
 if target_os in ['linux']:
     enrollee_env.AddPthreadIfNeeded()
     enrollee_env.AppendUnique(LIBS=['dl'])
-    enrollee_env.AppendUnique(RPATH=[enrollee_env.get('BUILD_DIR')])
     enrollee_env.PrependUnique(LIBS=[
         'oc',
         'octbstack',
@@ -91,7 +90,6 @@ if target_os in ['linux']:
 # Tizen Enrollee
 ######################################################################
 if target_os == 'tizen':
-    enrollee_env.AppendUnique(RPATH=[enrollee_env.get('BUILD_DIR')])
     enrollee_env.AppendUnique(CXXFLAGS=['-pthread'])
     enrollee_env.PrependUnique(LIBS=[
         'oc',
@@ -105,7 +103,6 @@ if target_os == 'tizen':
 # Arduino Enrollee
 ######################################################################
 if target_os == 'arduino':
-    enrollee_env.AppendUnique(RPATH=[enrollee_env.get('BUILD_DIR')])
     enrollee_env.PrependUnique(LIBS=[
         'oc',
         'octbstack',

diff --git a/service/easy-setup/mediator/richsdk/SConscript b/service/easy-setup/mediator/richsdk/SConscript
index 66ca5ea..e637ab9 100644 (file)
--- a/service/easy-setup/mediator/richsdk/SConscript
+++ b/service/easy-setup/mediator/richsdk/SConscript
@@ -80,7 +80,6 @@ if target_os in ['android']:
             env.get('SRC_DIR') +
             '/java/iotivity-android/build/native-libs/armeabi'
         ])
-    easy_setup_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
     easy_setup_env.AppendUnique(CXXFLAGS=['-frtti', '-fexceptions'])
     easy_setup_env.PrependUnique(LIBS=[
         'oc',
@@ -95,7 +94,6 @@ if target_os in ['android']:
         easy_setup_env.AppendUnique(LIBS=['log'])
 
 if target_os in ['linux', 'tizen']:
-    easy_setup_env.AppendUnique(RPATH=[env.get('BUILD_DIR')])
     easy_setup_env.AppendUnique(CXXFLAGS=['-pthread'])
     easy_setup_env.PrependUnique(LIBS=[
         'oc',

diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
index 280fd72..5525294 100644 (file)
--- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
+++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
@@ -60,20 +60,23 @@ mediator_env.PrependUnique(CPPPATH=[
     '#/service/easy-setup/inc',
 ])
 
-if env.get('SECURED') == '1':
-    mediator_env.PrependUnique(LIBS=['mbedtls', 'mbedx509', 'mbedcrypto'])
+mediator_env.PrependUnique(LIBS=['ESMediatorRich'])
 
-mediator_env.PrependUnique(LIBS=[
-    'ESMediatorRich',
-    'oc',
+if env.get('SECURED') == '1':
+    mediator_env.AppendUnique(LIBS=[
+        'ocpmapi',
+        'ocprovision',
+        'mbedtls',
+        'mbedx509',
+        'mbedcrypto',
+    ])
+
+mediator_env.AppendUnique(LIBS=['oc',
     'octbstack',
     'oc_logger',
     'connectivity_abstraction',
 ])
 
-if env.get('SECURED') == '1':
-    mediator_env.PrependUnique(LIBS=['ocpmapi', 'ocprovision'])
-
 mediator = mediator_env.Program('mediator', 'mediator.cpp')
 submediator = mediator_env.Program('submediator', 'submediator.cpp')
 

diff --git a/service/simulator/SConscript b/service/simulator/SConscript
index 72d71c9..2cfb96d 100644 (file)
--- a/service/simulator/SConscript
+++ b/service/simulator/SConscript
@@ -74,8 +74,7 @@ java_headers.append(os.path.join(java_headers[0], 'win32'))
 java_headers.append(os.path.join(java_headers[0], 'linux'))
 java_headers.append(os.path.join(java_headers[0], 'solaris'))
 simulator_env.AppendUnique(CPPPATH=java_headers)
-
-simulator_env.Append(RPATH=env.Literal('\\$$ORIGIN'))
+simulator_env['RPATH']=env.Literal('\\$$ORIGIN')
 
 simulator_env.AppendUnique(CPPPATH=['../../extlibs/cjson'])
 simulator_env.PrependUnique(LIBS=['oc', 'octbstack', 'RamlParser'])

diff --git a/service/simulator/ramlparser/SConscript b/service/simulator/ramlparser/SConscript
index cdd7faa..4937c7c 100644 (file)
--- a/service/simulator/ramlparser/SConscript
+++ b/service/simulator/ramlparser/SConscript
@@ -42,7 +42,7 @@ raml_env.AppendUnique(CXXFLAGS=[
     '-fmessage-length=0'
 ])
 raml_env.AppendUnique(CPPDEFINES=['LINUX'])
-raml_env.Append(RPATH=env.Literal('\\$$ORIGIN'))
+raml_env['RPATH']=env.Literal('\\$$ORIGIN')
 
 raml_env.PrependUnique(LIBS=['octbstack', 'YamlParser'])
 raml_env.AppendUnique(LIBS=['pthread', 'm', 'cjson'])