Skip to content

Commit 719c27e

Browse files
committed
Builds/links but fails runtime
1 parent 7d8557b commit 719c27e

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

cpp/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ project(
2222
version: '23.0.0-SNAPSHOT',
2323
license: 'Apache-2.0',
2424
meson_version: '>=1.3.0',
25-
default_options: ['c_std=gnu11,c11', 'warning_level=2', 'cpp_std=c++17'],
25+
# TODO: revert after https://github.com/mesonbuild/meson/issues/15202
26+
# OR figure out if we even need gnu11
27+
default_options: ['c_std=c11', 'warning_level=2', 'cpp_std=c++17'],
2628
)
2729

2830
project_args = [

cpp/src/arrow/util/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ configure_file(
8181
configuration: conf_data,
8282
format: 'cmake@',
8383
install: true,
84-
install_dir: 'arrow/util',
84+
install_dir: get_option('includedir') / 'arrow' / 'util',
8585
)
8686

8787
internal_conf_data = configuration_data()

python/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ pyarrow/_table_api.h
4545
manylinux1/arrow
4646
nm_arrow.log
4747
visible_symbols.log
48+
49+
# meson files
50+
subprojects/.wraplock

python/meson.build

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,11 @@ project(
3232
default_options: ['buildtype=release', 'cpp_std=c++17'],
3333
)
3434

35+
py = import('python').find_installation(pure: false)
36+
3537
install_data('../NOTICE.txt', install_dir: py.get_install_dir() / 'pyarrow')
3638

37-
arrow_dep = dependency(
38-
'arrow',
39-
'Arrow',
40-
modules: ['Arrow::arrow_shared'],
41-
required: false, # optional so sdist will work without finding
42-
)
39+
arrow_dep = dependency('arrow')
4340

4441
cc = meson.get_compiler('cpp')
4542

python/pyarrow/meson.build

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
py = import('python').find_installation(pure: false)
19-
2018
# When NumPy 2.0 becomes the minimum we can remove the
2119
# custom location check
2220
numpy_dep = dependency('numpy', required: false)
@@ -390,19 +388,19 @@ py.install_sources(
390388
subdir: 'pyarrow/include/arrow/python',
391389
)
392390

393-
if arrow_dep.found()
394-
arrow_header_dir = arrow_dep.get_variable(
391+
#if arrow_dep.found()
392+
# arrow_header_dir = arrow_dep.get_variable(
395393
# CMake has a local variable for ARROW_INCLUDE_DIR which is not
396394
# detectable from Meson
397395
# cmake: 'ARROW_INCLUDE_DIR',
398-
pkgconfig: 'includedir',
399-
) / 'arrow'
396+
# pkgconfig: 'includedir',
397+
# ) / 'arrow'
400398

401-
install_subdir(
402-
arrow_header_dir,
403-
install_dir: py.get_install_dir() / 'pyarrow/include',
404-
)
405-
endif
399+
# install_subdir(
400+
# arrow_header_dir,
401+
# install_dir: py.get_install_dir() / 'pyarrow/include',
402+
# )
403+
#endif
406404

407405
py.install_sources(
408406
files('src/arrow/python/vendored/pythoncapi_compat.h'),

python/subprojects/arrow

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../cpp/

0 commit comments

Comments
 (0)