[meson] Don't set RPATH on the binaries

Signed-off-by: Wojtek Porczyk <[email protected]>
gramineproject · Jan 28, 2025 · 88e8fee · 88e8fee
1 parent faa837b
commit 88e8fee
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 15 deletions.
diff --git a/subprojects/packagefiles/mbedtls/meson.build b/subprojects/packagefiles/mbedtls/meson.build
@@ -49,7 +49,6 @@ pkgconfig.generate(
     subdirs: 'gramine',
     libraries: [
         '-L${libdir}',
-        '-Wl,-rpath,${libdir}',
         '-Wl,--start-group',
         '-lmbedcrypto_gramine',
         '-lmbedtls_gramine',

diff --git a/tools/pf_crypt/meson.build b/tools/pf_crypt/meson.build
@@ -6,5 +6,4 @@ executable('gramine-sgx-pf-crypt',
     ],
 
     install: true,
-    install_rpath: get_option('prefix') / get_option('libdir'),
 )
diff --git a/tools/pf_tamper/meson.build b/tools/pf_tamper/meson.build
@@ -8,5 +8,4 @@ executable('gramine-sgx-pf-tamper',
     include_directories: common_inc, # for api.h
 
     install: true,
-    install_rpath: get_option('prefix') / get_option('libdir'),
 )
diff --git a/tools/sgx/common/meson.build b/tools/sgx/common/meson.build
@@ -9,7 +9,6 @@ sgx_util = static_library('sgx_util',
     ],
 
     install: true,
-    install_rpath: get_option('prefix') / get_option('libdir'),
 )
 
 sgx_util_dep = declare_dependency(

diff --git a/tools/sgx/is-sgx-available/meson.build b/tools/sgx/is-sgx-available/meson.build
@@ -6,5 +6,4 @@ executable('is-sgx-available',
     ],
 
     install: true,
-    install_rpath: get_option('prefix') / get_option('libdir'),
 )
diff --git a/tools/sgx/quote-view/meson.build b/tools/sgx/quote-view/meson.build
@@ -6,5 +6,4 @@ executable('gramine-sgx-quote-view',
     ],
 
     install: true,
-    install_rpath: get_option('prefix') / get_option('libdir'),
 )
diff --git a/tools/sgx/ra-tls/meson.build b/tools/sgx/ra-tls/meson.build
@@ -27,7 +27,6 @@ libra_tls_attest = shared_library('ra_tls_attest',
         mbedtls_static_dep,
     ],
     install: true,
-    install_rpath: get_option('prefix') / get_option('libdir'),
 )
 if get_option('libc') == 'glibc' and host_has_glibc
     meson.add_install_script('/bin/sh', '-c',
@@ -46,7 +45,6 @@ libra_tls_verify = static_library('ra_tls_verify',
         sgx_util_dep,
     ],
     install: true,
-    install_rpath: get_option('prefix') / get_option('libdir'),
 )
 if get_option('libc') == 'glibc' and host_has_glibc
     meson.add_install_script('/bin/sh', '-c',
@@ -73,7 +71,6 @@ libsecret_prov_attest = shared_library('secret_prov_attest',
         sgx_util_dep,
     ],
     install: true,
-    install_rpath: get_option('prefix') / get_option('libdir'),
 )
 if get_option('libc') == 'glibc' and host_has_glibc
     meson.add_install_script('/bin/sh', '-c',
@@ -93,7 +90,6 @@ libsecret_prov_verify = static_library('secret_prov_verify',
         sgx_util_dep,
     ],
     install: true,
-    install_rpath: join_paths(get_option('prefix'), get_option('libdir')),
 )
 if get_option('libc') == 'glibc' and host_has_glibc
     meson.add_install_script('/bin/sh', '-c',
@@ -120,7 +116,6 @@ if sgx_dcap_quoteverify_dep.found()
             sgx_util_dep,
         ],
         install: true,
-        install_rpath: get_option('prefix') / get_option('libdir'),
     )
     if get_option('libc') == 'glibc' and host_has_glibc
         meson.add_install_script('/bin/sh', '-c',
@@ -142,7 +137,6 @@ if sgx_dcap_quoteverify_dep.found()
             sgx_util_dep,
         ],
         install: true,
-        install_rpath: get_option('prefix') / get_option('libdir'),
     )
     if get_option('libc') == 'glibc' and host_has_glibc
         meson.add_install_script('/bin/sh', '-c',
@@ -165,7 +159,6 @@ if sgx_dcap_quoteverify_dep.found()
             threads_dep,
         ],
         install: true,
-        install_rpath: get_option('prefix') / get_option('libdir'),
     )
     if get_option('libc') == 'glibc' and host_has_glibc
         meson.add_install_script('/bin/sh', '-c',
@@ -182,7 +175,6 @@ pkgconfig.generate(
     subdirs: 'gramine',
     libraries: [
         '-L${libdir}',
-        '-Wl,-rpath,${libdir}',
         # RA-TLS consists of multiple independent libs, let user decide which to link
     ],
 )
@@ -194,7 +186,6 @@ pkgconfig.generate(
     subdirs: 'gramine',
     libraries: [
         '-L${libdir}',
-        '-Wl,-rpath,${libdir}',
         # Secret Prov consists of multiple independent libs, let user decide which to link
     ],
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,5 +6,4 @@ executable('gramine-sgx-pf-crypt', @@
         ],
         install: true,
-        install_rpath: get_option('prefix') / get_option('libdir'),
     )