[
https://issues.apache.org/jira/browse/ARROW-1855?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16265774#comment-16265774
]
ASF GitHub Bot commented on ARROW-1855:
---------------------------------------
wesm closed pull request #1355: ARROW-1855: [GLib] Add workaround for build
failure on macOS
URL: https://github.com/apache/arrow/pull/1355
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/c_glib/arrow-glib/Makefile.am b/c_glib/arrow-glib/Makefile.am
index 5ecb1a661..e8073115d 100644
--- a/c_glib/arrow-glib/Makefile.am
+++ b/c_glib/arrow-glib/Makefile.am
@@ -207,6 +207,11 @@ if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS =
+INTROSPECTION_SCANNER_ENV =
+if OS_MACOS
+INTROSPECTION_SCANNER_ENV += \
+ ARCHFLAGS=
+endif
INTROSPECTION_COMPILER_ARGS =
Arrow-1.0.gir: libarrow-glib.la
diff --git a/c_glib/arrow-gpu-glib/Makefile.am
b/c_glib/arrow-gpu-glib/Makefile.am
index ec9615987..11ffa5ecb 100644
--- a/c_glib/arrow-gpu-glib/Makefile.am
+++ b/c_glib/arrow-gpu-glib/Makefile.am
@@ -72,6 +72,10 @@ INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS =
INTROSPECTION_SCANNER_ENV = \
PKG_CONFIG_PATH=${abs_builddir}/../arrow-glib:$${PKG_CONFIG_PATH}
+if OS_MACOS
+INTROSPECTION_SCANNER_ENV += \
+ ARCHFLAGS=
+endif
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(abs_builddir)/../arrow-glib
diff --git a/c_glib/configure.ac b/c_glib/configure.ac
index c6fa0192c..f06a017a1 100644
--- a/c_glib/configure.ac
+++ b/c_glib/configure.ac
@@ -34,6 +34,19 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.13 foreign])
AM_SILENT_RULES([yes])
+AC_CANONICAL_HOST
+AC_MSG_CHECKING([for macOS])
+case "$host_os" in
+darwin*)
+ os_macos=yes
+ ;;
+*)
+ os_macos=no
+ ;;
+esac
+AC_MSG_RESULT([$os_macos])
+AM_CONDITIONAL(OS_MACOS, test "$os_macos" = "yes")
+
AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11([ext], [mandatory])
diff --git a/ci/travis_before_script_c_glib.sh
b/ci/travis_before_script_c_glib.sh
index 99d05397a..9d07e02a8 100755
--- a/ci/travis_before_script_c_glib.sh
+++ b/ci/travis_before_script_c_glib.sh
@@ -97,13 +97,7 @@ if [ $BUILD_SYSTEM = "autotools" ]; then
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS CXXFLAGS=-DARROW_NO_DEPRECATED_API"
./configure $CONFIGURE_OPTIONS
-
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
- ARCHFLAGS="-arch x86_64" make -j4
- else
- make -j4
- fi
-
+ make -j4
make install
else
MESON_OPTIONS="--prefix=$ARROW_C_GLIB_INSTALL"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> [GLib] Add workaround for build failure on macOS
> ------------------------------------------------
>
> Key: ARROW-1855
> URL: https://issues.apache.org/jira/browse/ARROW-1855
> Project: Apache Arrow
> Issue Type: Improvement
> Components: GLib
> Affects Versions: 0.7.1
> Reporter: Kouhei Sutou
> Assignee: Kouhei Sutou
> Priority: Minor
> Labels: pull-request-available
> Fix For: 0.8.0
>
>
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
