static/target_type reversals

Author: WillAyd

python/meson.build

@@ -36,7 +36,7 @@ py = import('python').find_installation(pure: false)
 
 #install_data('../NOTICE.txt', install_dir: py.get_install_dir() / 'pyarrow')
 
-if host_machine.system() == 'windows' or get_option('default_library') == 'static'
+if get_option('default_library') == 'static'
     cmake_suffix = 'static'
 else
     cmake_suffix = 'shared'

python/pyarrow/meson.build

@@ -225,23 +225,15 @@ endif
 
 gnu_symbol_visibility = host_machine.system() == 'darwin' ? 'default' : 'inlineshidden'
 
-# Windows requirements for shared libraries are complex - see
-# https://mesonbuild.com/meson-python/how-to-guides/shared-libraries.html
 if get_option('default_library') == 'static'
-    target_type = 'static_library'
-else
-    target_type = 'shared_library'
-endif
-
-if target_type == 'static_library'
     pyarrow_private_args = ['-DARROW_PYTHON_STATIC']
     pyarrow_public_args = ['-DARROW_PYTHON_STATIC']
 else
     pyarrow_private_args = ['-DARROW_PYTHON_EXPORTING']
     pyarrow_public_args = []
 endif
 
-pyarrow_lib = build_target(
+pyarrow_lib = library(
     'arrow_python',
     sources: pyarrow_srcs,
     include_directories: ['src'],
@@ -255,23 +247,22 @@ pyarrow_lib = build_target(
     install_dir: py.get_install_dir() / 'pyarrow',
     gnu_symbol_visibility: gnu_symbol_visibility,
     override_options: ['b_lundef=false'],
-    target_type: target_type,
 )
 pyarrow_lib_dep = declare_dependency(
     link_with: [pyarrow_lib],
     compile_args: pyarrow_public_args,
 )
 
 if needs_flight
-    if target_type == 'static_library'
+    if get_option('default_library') == 'static'
         pyarrow_flight_private_args = ['-DARROW_PYFLIGHT_STATIC']
         pyarrow_flight_public_args = ['-DARROW_PYFLIGHT_STATIC']
     else
         pyarrow_flight_private_args = ['-DARROW_PYFLIGHT_EXPORTING']
         pyarrow_flight_public_args = []
     endif
 
-    pyarrow_flight_lib = build_target(
+    pyarrow_flight_lib = library(
         'arrow_flight_lib',
         sources: ['src/arrow/python/flight.cc'],
         dependencies: [arrow_flight_dep, pyarrow_lib_dep, py.dependency()],
@@ -281,7 +272,6 @@ if needs_flight
         install_dir: py.get_install_dir() / 'pyarrow',
         gnu_symbol_visibility: gnu_symbol_visibility,
         override_options: ['b_lundef=false'],
-        target_type: target_type,
     )
 
     pyarrow_flight_dep = declare_dependency(
@@ -293,7 +283,7 @@ if needs_flight
 endif
 
 if needs_parquet_encryption
-    if target_type == 'static_library'
+    if get_option('default_library') == 'static'
         pyarrow_pq_enc_private_args = [
             '-DARROW_PYTHON_PARQUET_ENCRYPTION_STATIC',
         ]
@@ -307,7 +297,7 @@ if needs_parquet_encryption
         pyarrow_pq_enc_public_args = []
     endif
 
-    pyarrow_encryption_lib = build_target(
+    pyarrow_encryption_lib = library(
         'arrow_python_parquet_encryption',
         sources: ['src/arrow/python/parquet_encryption.cc'],
         include_directories: ['src'],
@@ -317,7 +307,6 @@ if needs_parquet_encryption
         install_dir: py.get_install_dir() / 'pyarrow',
         gnu_symbol_visibility: gnu_symbol_visibility,
         override_options: ['b_lundef=false'],
-        target_type: target_type,
     )
 
     pyarrow_parquet_encryption_dep = declare_dependency(