Skip to content

Commit

Permalink
fix linux build by removing CXXABI flag from older arrow
Browse files Browse the repository at this point in the history
  • Loading branch information
timkpaine committed Feb 24, 2024
1 parent f5e8156 commit 14340ea
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ if(NOT WIN32)
if(MACOS)
set(module_origin_path "@loader_path")
else()
set(module_origin_path "\$ORIGIN")
set(module_origin_path "\$ORIGIN")
endif()
else()
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
Expand All @@ -132,7 +132,7 @@ endif()
# Flags #
#########
set(CMAKE_POSITION_INDEPENDENT_CODE On)
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
# add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)

# Compiler version flags
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
Expand Down Expand Up @@ -203,7 +203,7 @@ endif()
###############################################################################################################
# Messages #
############
message("Building CPP Template version v${ARROW_PYTHON_NOCOPY_VERSION_MAJOR}.${ARROW_PYTHON_NOCOPY_VERSION_MINOR}.${ARROW_PYTHON_NOCOPY_VERSION_PATCH} [${ARROW_PYTHON_NOCOPY_VERSION_COMMIT_SHA}]")
message("Building Arrow-Python-Nocopy version v${ARROW_PYTHON_NOCOPY_VERSION_MAJOR}.${ARROW_PYTHON_NOCOPY_VERSION_MINOR}.${ARROW_PYTHON_NOCOPY_VERSION_PATCH} [${ARROW_PYTHON_NOCOPY_VERSION_COMMIT_SHA}]")
string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)

if(CMAKE_BUILD_TYPE_LOWER STREQUAL debug)
Expand Down Expand Up @@ -235,7 +235,7 @@ set(
)

add_library(arrow-python-nocopy SHARED ${PROJECT_SRCS})
target_link_libraries(arrow-python-nocopy PRIVATE ${Arrow_LIBRARY})
target_link_libraries(arrow-python-nocopy PRIVATE Arrow::arrow_static)
set_target_properties(arrow-python-nocopy PROPERTIES PUBLIC_HEADER "${PROJECT_HDRS}")

# export symbols
Expand Down
3 changes: 0 additions & 3 deletions arrow_python_nocopy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
import pandas as pd
from .lib.pybind11extension import array_info, create_array
from .lib.pybind11extension import schema_info, create_schema
# from .lib.pybind11extension import table_info, create_table

from .lib.cpythonextension import array_info as array_info_cp, create_array as create_array_cp
from .lib.cpythonextension import schema_info as schema_info_cp, create_schema as create_schema_cp
# from .lib.cpythonextension import table_info as table_info_cp, create_table as create_table_cp


__version__ = "0.1.0"
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ line-length = 170
"__init__.py" = ["F401", "F403"]

[tool.pytest.ini_options]
asyncio_mode = "strict"
testpaths = "arrow_python_nocopy/tests"

[tool.setuptools]
Expand Down
1 change: 1 addition & 0 deletions src/apn-python/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "Python.h"
#include <arrow/table.h>
#include <apn-common/exports.h>
#include<arrow/util/key_value_metadata.h>

LIB_EXPORT std::shared_ptr<arrow::Array> unpack_array(PyObject*);
LIB_EXPORT std::shared_ptr<arrow::DataType> unpack_dtype(PyObject*);
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 4984 files

0 comments on commit 14340ea

Please sign in to comment.