[arrow] branch master updated: ARROW-5697: [GLib] Use system pkg-config in c_glib/Dockerfile to correctly find system libraries such as libglib

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 83e4158  ARROW-5697: [GLib] Use system pkg-config in c_glib/Dockerfile to correctly find system libraries such as libglib
83e4158 is described below

commit 83e4158d002741b5e5f673a91fe86966baafc4f0
Author: Wes McKinney <we...@apache.org>
AuthorDate: Thu Jun 27 10:17:57 2019 +0900

    ARROW-5697: [GLib] Use system pkg-config in c_glib/Dockerfile to correctly find system libraries such as libglib
    
    The conda-provided pkg-config was being used
    
    Author: Wes McKinney <we...@apache.org>
    Author: Sutou Kouhei <ko...@clear-code.com>
    
    Closes #4664 from wesm/docker-glib-build and squashes the following commits:
    
    ae66d228 <Sutou Kouhei> Ensure using system pkg-config
    d88c9f6e <Wes McKinney> Try to fix c_glib Dockerfile
---
 c_glib/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/c_glib/Dockerfile b/c_glib/Dockerfile
index 163db7f..813695c 100644
--- a/c_glib/Dockerfile
+++ b/c_glib/Dockerfile
@@ -30,7 +30,7 @@ RUN apt-get update -y -q && \
     && rm -rf /var/lib/apt/lists/*
 
 COPY c_glib/Gemfile /arrow/c_glib/
-RUN conda install meson=0.47.1 && \
+RUN conda install meson=0.50.1 && \
     conda clean --all && \
     gem install bundler && \
     bundle install --gemfile arrow/c_glib/Gemfile
@@ -40,6 +40,7 @@ ENV ARROW_BUILD_TESTS=OFF \
     ARROW_BUILD_UTILITIES=OFF \
     ARROW_INSTALL_NAME_RPATH=OFF \
     LD_LIBRARY_PATH="${CONDA_PREFIX}/lib" \
+    PKG_CONFIG=/usr/bin/pkg-config \
     PKG_CONFIG_PATH="${CONDA_PREFIX}/lib/pkgconfig" \
     GI_TYPELIB_PATH="${CONDA_PREFIX}/lib/girepository-1.0"