[arrow] branch master updated: ARROW-6192: [GLib] Use the same SO version as C++

[sh...@apache.org]

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

shiro 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 53c299e  ARROW-6192: [GLib] Use the same SO version as C++
53c299e is described below

commit 53c299e01aa82d7380022fa07155b125dca398fe
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Sun Aug 11 07:54:16 2019 +0900

    ARROW-6192: [GLib] Use the same SO version as C++
    
    Closes #5051 from kou/glib-use-the-same-so-versions-as-cpp and squashes the following commits:
    
    5d827fc77 <Sutou Kouhei>  Use the same SO version as C++
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Yosuke Shiro <yo...@gmail.com>
---
 c_glib/configure.ac | 2 +-
 c_glib/meson.build  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/c_glib/configure.ac b/c_glib/configure.ac
index ba3909c..66f88c0 100644
--- a/c_glib/configure.ac
+++ b/c_glib/configure.ac
@@ -66,7 +66,7 @@ AC_MSG_RESULT([$os_macos])
 AM_CONDITIONAL(OS_MACOS, test "$os_macos" = "yes")
 
 LT_INIT
-LT_CURRENT=${GARROW_VERSION_MINOR}
+LT_CURRENT=$(expr ${GARROW_VERSION_MAJOR} \* 100 + ${GARROW_VERSION_MINOR})
 LT_REVISION=${GARROW_VERSION_MICRO}
 LT_AGE=0
 LT_VERSION_INFO="\$(LT_CURRENT):\$(LT_REVISION):\$(LT_AGE)"
diff --git a/c_glib/meson.build b/c_glib/meson.build
index abb39da..319d698 100644
--- a/c_glib/meson.build
+++ b/c_glib/meson.build
@@ -36,7 +36,7 @@ version_minor = version_numbers[1].to_int()
 version_micro = version_numbers[2].to_int()
 
 api_version = '1.0'
-so_version = version_minor
+so_version = version_major * 100 + version_minor
 so_version_patch = version_micro
 library_version = '@0@.@1@.@2@'.format(so_version, so_version_patch, 0)