You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2018/04/01 09:31:26 UTC

[arrow] branch master updated: ARROW-2370: [GLib] Fix include path in .pc on Meson build

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

uwe 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 be049fa  ARROW-2370: [GLib] Fix include path in .pc on Meson build
be049fa is described below

commit be049fa1b2587241bbec974b5e9caa52eda63250
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Sun Apr 1 11:31:10 2018 +0200

    ARROW-2370: [GLib] Fix include path in .pc on Meson build
    
    `-I${includedir}` is correct. `-I${includedir}/arrow-glib` is wrong.
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #1812 from kou/glib-meson-fix-include-path-in-pc and squashes the following commits:
    
    cd4faa6 <Kouhei Sutou>  Fix include path in .pc on Meson build
---
 c_glib/arrow-glib/meson.build     | 3 +--
 c_glib/arrow-gpu-glib/meson.build | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/c_glib/arrow-glib/meson.build b/c_glib/arrow-glib/meson.build
index 25968e6..699489f 100644
--- a/c_glib/arrow-glib/meson.build
+++ b/c_glib/arrow-glib/meson.build
@@ -184,8 +184,7 @@ pkgconfig.generate(filebase: meson.project_name(),
                    description: 'C API for Apache Arrow based on GLib',
                    version: version,
                    requires: ['gio-2.0', 'arrow'],
-                   libraries: [libarrow_glib],
-                   subdirs: ['arrow-glib'])
+                   libraries: [libarrow_glib])
 
 arrow_glib_gir = gnome.generate_gir(libarrow_glib,
                                     sources: sources + c_headers + enums,
diff --git a/c_glib/arrow-gpu-glib/meson.build b/c_glib/arrow-gpu-glib/meson.build
index 00c7f07..5b21286 100644
--- a/c_glib/arrow-gpu-glib/meson.build
+++ b/c_glib/arrow-gpu-glib/meson.build
@@ -59,8 +59,7 @@ pkgconfig.generate(filebase: 'arrow-gpu-glib',
                    description: 'C API for Apache Arrow GPU based on GLib',
                    version: version,
                    requires: ['arrow-glib', 'arrow-gpu'],
-                   libraries: [libarrow_gpu_glib],
-                   subdirs: ['arrow-gpu-glib'])
+                   libraries: [libarrow_gpu_glib])
 
 gnome.generate_gir(libarrow_gpu_glib,
                    dependencies: arrow_glib_gir_dependency,

-- 
To stop receiving notification emails like this one, please contact
uwe@apache.org.