Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Random fixes before AlmaLinux (RHEL) 10 #2090

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion python/graminelibos.dist-info/meson.build
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
install_dir = python3_platlib / 'graminelibos.dist-info'
conf = configuration_data()
conf.set('NAME', meson.project_name())
conf.set('VERSION', meson.project_version())
conf.set('LICENSE', ', '.join(meson.project_license()))

# VERSION needs to comply with the official specification, which is restrictive:
# https://packaging.python.org/en/latest/specifications/version-specifiers/
# In Gramine, we use X.Y, X.Y.Z, X.Y~rcN and X.Ypost~UNRELEASED, which is
# exactly what we want for distro packages (~ sorts negative), but can't be used
# for python distributions.
conf.set('VERSION',
meson.project_version().replace('~UNRELEASED', '').replace('~', ''))

# https://packaging.python.org/en/latest/specifications/core-metadata/
configure_file(
input: 'METADATA.in',
Expand Down
1 change: 0 additions & 1 deletion subprojects/packagefiles/mbedtls/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ pkgconfig.generate(
subdirs: 'gramine',
libraries: [
'-L${libdir}',
'-Wl,-rpath,${libdir}',
'-Wl,--start-group',
'-lmbedcrypto_gramine',
'-lmbedtls_gramine',
Expand Down
1 change: 0 additions & 1 deletion tools/pf_crypt/meson.build
Original file line number Diff 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'),
)
1 change: 0 additions & 1 deletion tools/pf_tamper/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
)
1 change: 0 additions & 1 deletion tools/sgx/common/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion tools/sgx/is-sgx-available/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ executable('is-sgx-available',
],

install: true,
install_rpath: get_option('prefix') / get_option('libdir'),
)
1 change: 0 additions & 1 deletion tools/sgx/quote-view/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ executable('gramine-sgx-quote-view',
],

install: true,
install_rpath: get_option('prefix') / get_option('libdir'),
)
9 changes: 0 additions & 9 deletions tools/sgx/ra-tls/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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
],
)
Expand All @@ -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
],
)
Expand Down