Skip to content
Merged
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
2 changes: 1 addition & 1 deletion glib/adbc-arrow-glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ adbc_arrow_glib_gir = \
libadbc_arrow_glib,
dependencies: [declare_dependency(sources: adbc_glib_gir), arrow_glib],
export_packages: 'adbc-arrow-glib',
extra_args: ['--warn-all'],
extra_args: gir_scanner_extra_args,
fatal_warnings: gi_fatal_warnings,
header: 'adbc-arrow-glib/adbc-arrow-glib.h',
identifier_prefix: 'GADBCArrow',
Expand Down
2 changes: 1 addition & 1 deletion glib/adbc-glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pkgconfig.generate(
adbc_glib_gir = gnome.generate_gir(
libadbc_glib,
export_packages: 'adbc-glib',
extra_args: ['--warn-all'],
extra_args: gir_scanner_extra_args,
fatal_warnings: gi_fatal_warnings,
header: 'adbc-glib/adbc-glib.h',
identifier_prefix: 'GADBC',
Expand Down
14 changes: 13 additions & 1 deletion glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ if adbc_build_dir != ''
adbc_build_dir = meson.source_root() / adbc_build_dir
endif

c_compiler = meson.get_compiler('c')
if adbc_build_dir == ''
adbc_driver_manager = dependency('adbc-driver-manager')
else
c_compiler = meson.get_compiler('c')
adbc_driver_manager = c_compiler.find_library(
'adbc_driver_manager',
dirs: [adbc_build_dir],
Expand All @@ -76,6 +76,18 @@ if generate_vapi
add_languages('vala')
endif

# Specify -fPIE explicitly for g-ir-scanner because PIE is disabled by
# default on AlmaLinux 9 RPM build by
# LDFLAGS="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld".
gir_scanner_cflags = c_compiler.get_supported_arguments('-fPIE')
if gir_scanner_cflags.length() == 0
gir_scanner_extra_args = []
else
gir_scanner_extra_args = ['--cflags-begin'] + gir_scanner_cflags + [
'--cflags-end',
]
endif

subdir('adbc-glib')
arrow_glib = dependency('arrow-glib', required: generate_vapi)
if arrow_glib.found()
Expand Down
Loading