Skip to content

Commit

Permalink
ARROW-2990: [GLib] Support building with rpath-ed Arrow C++ on macOS
Browse files Browse the repository at this point in the history
Author: Kouhei Sutou <kou@clear-code.com>

Closes #2374 from kou/glib-macos and squashes the following commits:

c8b5c45 <Kouhei Sutou>  Support building with rpath-ed Arrow C++ on macOS
  • Loading branch information
kou authored and wesm committed Aug 6, 2018
1 parent ae95780 commit da7a48e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 20 deletions.
19 changes: 10 additions & 9 deletions c_glib/arrow-glib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,6 @@ if HAVE_INTROSPECTION
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS =
INTROSPECTION_SCANNER_ENV =
if USE_ARROW_BUILD_DIR
INTROSPECTION_SCANNER_ENV += \
LD_LIBRARY_PATH=$(ARROW_LIB_DIR):$${LD_LIBRARY_PATH}
endif
if OS_MACOS
INTROSPECTION_SCANNER_ENV += \
ARCHFLAGS=
endif
INTROSPECTION_COMPILER_ARGS =

Arrow-1.0.gir: libarrow-glib.la
Expand All @@ -261,12 +253,21 @@ Arrow_1_0_gir_INCLUDES = \
Gio-2.0
Arrow_1_0_gir_CFLAGS = \
$(AM_CPPFLAGS)
Arrow_1_0_gir_LIBS = libarrow-glib.la
Arrow_1_0_gir_LIBS =
Arrow_1_0_gir_FILES = $(libarrow_glib_la_sources)
Arrow_1_0_gir_SCANNERFLAGS = \
--library-path=$(ARROW_LIB_DIR) \
--warn-all \
--identifier-prefix=GArrow \
--symbol-prefix=garrow
if OS_MACOS
Arrow_1_0_gir_LIBS += arrow-glib
Arrow_1_0_gir_SCANNERFLAGS += \
--no-libtool \
--library-path=$(abs_builddir)/.libs
else
Arrow_1_0_gir_LIBS += libarrow-glib.la
endif
INTROSPECTION_GIRS += Arrow-1.0.gir

girdir = $(datadir)/gir-1.0
Expand Down
28 changes: 17 additions & 11 deletions c_glib/arrow-gpu-glib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ else
INTROSPECTION_SCANNER_ENV += \
PKG_CONFIG_PATH=${abs_builddir}/../arrow-glib:$${PKG_CONFIG_PATH}
endif
if OS_MACOS
INTROSPECTION_SCANNER_ENV += \
ARCHFLAGS=
endif
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(abs_builddir)/../arrow-glib

Expand All @@ -95,20 +91,30 @@ ArrowGPU_1_0_gir_INCLUDES = \
ArrowGPU_1_0_gir_CFLAGS = \
$(AM_CPPFLAGS)
ArrowGPU_1_0_gir_LDFLAGS =
if USE_ARROW_BUILD_DIR
ArrowGPU_1_0_gir_LDFLAGS += \
-L$(ARROW_LIB_DIR)
endif
ArrowGPU_1_0_gir_LIBS = \
$(abs_builddir)/../arrow-glib/libarrow-glib.la \
libarrow-gpu-glib.la
ArrowGPU_1_0_gir_LIBS =
ArrowGPU_1_0_gir_FILES = \
$(libarrow_gpu_glib_la_sources)
ArrowGPU_1_0_gir_SCANNERFLAGS = \
--library-path=$(ARROW_LIB_DIR) \
--warn-all \
--add-include-path=$(abs_builddir)/../arrow-glib \
--identifier-prefix=GArrowGPU \
--symbol-prefix=garrow_gpu
if OS_MACOS
ArrowGPU_1_0_gir_LIBS += \
arrow-glib \
arrow-gpu-glib
ArrowGPU_1_0_gir_SCANNERFLAGS += \
--no-libtool \
--library-path=$(abs_builddir)/../arrow-glib/.libs \
--library-path=$(abs_builddir)/.libs
else
ArrowGPU_1_0_gir_LIBS += \
$(abs_builddir)/../arrow-glib/libarrow-glib.la \
libarrow-gpu-glib.la
endif

\
INTROSPECTION_GIRS += ArrowGPU-1.0.gir

girdir = $(datadir)/gir-1.0
Expand Down
2 changes: 2 additions & 0 deletions c_glib/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ if test "x$GARROW_ARROW_CPP_BUILD_DIR" = "x"; then
USE_ARROW_BUILD_DIR=no

PKG_CHECK_MODULES([ARROW], [arrow arrow-compute])
_PKG_CONFIG(ARROW_LIB_DIR, [variable=libdir], [arrow])
ARROW_LIB_DIR="$pkg_cv_ARROW_LIB_DIR"
PKG_CHECK_MODULES([ARROW_ORC],
[arrow-orc],
[HAVE_ARROW_ORC=yes],
Expand Down

0 comments on commit da7a48e

Please sign in to comment.