Skip to content

Commit

Permalink
Use target.aix_so_archive to decide to archive shared library in AIX
Browse files Browse the repository at this point in the history
Previously, AIX support was updated to archive shared libraries per AIX
platform conventions, which expect .a files that contain .so files. This
is usually correct, but an edge case occurs for loadable plugins, e.g.
what meson creates for `shared_module()`. A notable example is python
extensions (SciPy, for example).

These should *not* be archived, because the .so file itself needs to be
loaded as a plugin. For example, SciPy fails to import in the python
interpreter.

Handle this by differentiating between plugins and regular libraries,
and only archiving when safe to do so.

Fixes mesonbuild#12219
  • Loading branch information
KamathForAIX authored and eli-schwartz committed Oct 31, 2023
1 parent ce691f8 commit f4d19db
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
3 changes: 3 additions & 0 deletions mesonbuild/backend/backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,9 @@ def get_target_filename_for_linking(self, target: T.Union[build.Target, build.Cu
# On all other platforms, we link to the library directly.
if isinstance(target, build.SharedLibrary):
link_lib = target.get_import_filename() or target.get_filename()
# In AIX, if we archive .so, the blibpath must link to archived shared library otherwise to the .so file.
if mesonlib.is_aix() and target.aix_so_archive:
link_lib = re.sub('[.][a]([.]?([0-9]+))*([.]?([a-z]+))*', '.a', link_lib.replace('.so', '.a'))
return os.path.join(self.get_target_dir(target), link_lib)
elif isinstance(target, build.StaticLibrary):
return os.path.join(self.get_target_dir(target), target.get_filename())
Expand Down
12 changes: 4 additions & 8 deletions mesonbuild/backend/ninjabackend.py
Original file line number Diff line number Diff line change
Expand Up @@ -1060,8 +1060,9 @@ def generate_target(self, target):
#In AIX, we archive shared libraries. If the instance is a shared library, we add a command to archive the shared library
#object and create the build element.
if isinstance(target, build.SharedLibrary) and self.environment.machines[target.for_machine].is_aix():
elem = NinjaBuildElement(self.all_outputs, linker.get_archive_name(outname), 'AIX_LINKER', [outname])
self.add_build(elem)
if target.aix_so_archive:
elem = NinjaBuildElement(self.all_outputs, linker.get_archive_name(outname), 'AIX_LINKER', [outname])
self.add_build(elem)

def should_use_dyndeps_for_target(self, target: 'build.BuildTarget') -> bool:
if mesonlib.version_compare(self.ninja_version, '<1.10.0'):
Expand Down Expand Up @@ -3457,11 +3458,6 @@ def generate_link(self, target: build.BuildTarget, outname, obj_list, linker: T.
else:
dependencies = target.get_dependencies()
internal = self.build_target_link_arguments(linker, dependencies)
#In AIX since shared libraries are archived the dependencies must
#depend on .a file with the .so and not directly on the .so file.
if self.environment.machines[target.for_machine].is_aix():
for i, val in enumerate(internal):
internal[i] = linker.get_archive_name(val)
commands += internal
# Only non-static built targets need link args and link dependencies
if not isinstance(target, build.StaticLibrary):
Expand Down Expand Up @@ -3667,7 +3663,7 @@ def generate_ending(self) -> None:
# Add the first output of each target to the 'all' target so that
# they are all built
#Add archive file if shared library in AIX for build all.
if isinstance(t, build.SharedLibrary):
if isinstance(t, build.SharedLibrary) and t.aix_so_archive:
if self.environment.machines[t.for_machine].is_aix():
linker, stdlib_args = self.determine_linker_and_stdlib_args(t)
t.get_outputs()[0] = linker.get_archive_name(t.get_outputs()[0])
Expand Down
6 changes: 6 additions & 0 deletions mesonbuild/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -2171,6 +2171,9 @@ class SharedLibrary(BuildTarget):

typename = 'shared library'

# Used by AIX to decide whether to archive shared library or not.
aix_so_archive = True

def __init__(
self,
name: str,
Expand Down Expand Up @@ -2436,6 +2439,9 @@ class SharedModule(SharedLibrary):

typename = 'shared module'

# Used by AIX to not archive shared library for dlopen mechanism
aix_so_archive = False

def __init__(
self,
name: str,
Expand Down
3 changes: 2 additions & 1 deletion mesonbuild/minstall.py
Original file line number Diff line number Diff line change
Expand Up @@ -722,8 +722,9 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix
# In AIX, we archive our shared libraries. When we install any package in AIX we need to
# install the archive in which the shared library exists. The below code does the same.
# We change the .so files having lt_version or so_version to archive file install.
# If .so does not exist then it means it is in the archive. Otherwise it is a .so that exists.
if is_aix():
if '.so' in t.fname:
if not os.path.exists(t.fname) and '.so' in t.fname:
t.fname = re.sub('[.][a]([.]?([0-9]+))*([.]?([a-z]+))*', '.a', t.fname.replace('.so', '.a'))
if not self.should_install(t):
continue
Expand Down

0 comments on commit f4d19db

Please sign in to comment.