arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-678: [GLib] Fix dependencies
Date Wed, 22 Mar 2017 04:15:26 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 55d8f99c3 -> 82b15a4c3


ARROW-678: [GLib] Fix dependencies

libarrow-glib-io.so should link to libarrow-glib.so.

libarrow-glib-ipc.so should link to libarrow-glib.so and
libarrow-io-glib.so.

Author: Kouhei Sutou <kou@clear-code.com>

Closes #413 from kou/glib-fix-dependencies and squashes the following commits:

f67c04e [Kouhei Sutou] [GLib] Fix dependencies


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/82b15a4c
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/82b15a4c
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/82b15a4c

Branch: refs/heads/master
Commit: 82b15a4c38d5bc3bf0e2e1ff27a0dfc7c8929551
Parents: 55d8f99
Author: Kouhei Sutou <kou@clear-code.com>
Authored: Wed Mar 22 00:15:19 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Wed Mar 22 00:15:19 2017 -0400

----------------------------------------------------------------------
 c_glib/arrow-glib/Makefile.am | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/82b15a4c/c_glib/arrow-glib/Makefile.am
----------------------------------------------------------------------
diff --git a/c_glib/arrow-glib/Makefile.am b/c_glib/arrow-glib/Makefile.am
index 7699594..a948007 100644
--- a/c_glib/arrow-glib/Makefile.am
+++ b/c_glib/arrow-glib/Makefile.am
@@ -232,7 +232,8 @@ libarrow_io_glib_la_CXXFLAGS =			\
 
 libarrow_io_glib_la_LIBADD =			\
 	$(GLIB_LIBS)				\
-	$(ARROW_IO_LIBS)
+	$(ARROW_IO_LIBS)			\
+	libarrow-glib.la
 
 libarrow_io_glib_la_headers =			\
 	arrow-io-glib.h				\
@@ -329,7 +330,9 @@ libarrow_ipc_glib_la_CXXFLAGS =			\
 
 libarrow_ipc_glib_la_LIBADD =			\
 	$(GLIB_LIBS)				\
-	$(ARROW_IPC_LIBS)
+	$(ARROW_IPC_LIBS)			\
+	libarrow-glib.la			\
+	libarrow-io-glib.la
 
 libarrow_ipc_glib_la_headers =			\
 	arrow-ipc-glib.h			\
@@ -448,9 +451,7 @@ ArrowIO_1_0_gir_INCLUDES =			\
 	GObject-2.0
 ArrowIO_1_0_gir_CFLAGS =			\
 	$(AM_CPPFLAGS)
-ArrowIO_1_0_gir_LIBS =				\
-	libarrow-io-glib.la			\
-	libarrow-glib.la
+ArrowIO_1_0_gir_LIBS = libarrow-io-glib.la
 ArrowIO_1_0_gir_FILES = $(libarrow_io_glib_la_sources)
 ArrowIO_1_0_gir_SCANNERFLAGS =				\
 	--include-uninstalled=$(builddir)/Arrow-1.0.gir	\
@@ -469,10 +470,7 @@ ArrowIPC_1_0_gir_INCLUDES =			\
 	GObject-2.0
 ArrowIPC_1_0_gir_CFLAGS =			\
 	$(AM_CPPFLAGS)
-ArrowIPC_1_0_gir_LIBS =				\
-	libarrow-ipc-glib.la			\
-	libarrow-io-glib.la			\
-	libarrow-glib.la
+ArrowIPC_1_0_gir_LIBS = libarrow-ipc-glib.la
 ArrowIPC_1_0_gir_FILES = $(libarrow_ipc_glib_la_sources)
 ArrowIPC_1_0_gir_SCANNERFLAGS =					\
 	--include-uninstalled=$(builddir)/Arrow-1.0.gir		\


Mime
View raw message