From de8b4c5b99c38d88f3bd7022ff875c2cea41b87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Thu, 6 Oct 2022 22:25:36 +0200 Subject: [PATCH] meson: Remove some forgotten Python 2.x remnants --- meson.build | 6 ------ src/_frida.version | 1 - src/meson.build | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 49e626a..d166c65 100644 --- a/meson.build +++ b/meson.build @@ -78,12 +78,6 @@ endif python_site_packages = join_paths(get_option('libdir'), python_name, 'site-packages') -if python_version.version_compare('>3') - python_plugin_export_name = 'PyInit__frida' -else - python_plugin_export_name = 'init_frida' -endif - cdata = configuration_data() cdata.set('HAVE_' + host_os_family.to_upper(), 1) diff --git a/src/_frida.version b/src/_frida.version index 4e01f16..11f46b0 100644 --- a/src/_frida.version +++ b/src/_frida.version @@ -1,7 +1,6 @@ FRIDA_PYTHON { global: PyInit__frida; - init_frida; local: *; diff --git a/src/meson.build b/src/meson.build index 628276d..8fbb5d1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,6 +1,6 @@ extra_link_args = [] if host_os_family == 'darwin' - extra_link_args += ['-Wl,-exported_symbol,_' + python_plugin_export_name] + extra_link_args += ['-Wl,-exported_symbol,_PyInit__frida'] elif host_os_family != 'windows' extra_link_args += ['-Wl,--version-script,' + join_paths(meson.current_source_dir(), '_frida.version')] endif