summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2018-11-16 16:25:03 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2018-11-16 16:25:03 +0000
commit61daa6ce1b7df2a10b9ed320477b5141ba2208a9 (patch)
tree519ac59895aa8ece6f5110e18e000a18bb06935e
parent1c91f930cf0ec6b538808bade74c9d290bd9f53b (diff)
parentdf43643be2c8668ba4c1f7bb702ee32a78dc096a (diff)
downloadgdk-pixbuf-61daa6ce1b7df2a10b9ed320477b5141ba2208a9.tar.gz
Merge branch 'fix-darwin-lib-versions' into 'master'
meson: use an autotools compatible compatibility_version/current_version on macOS See merge request GNOME/gdk-pixbuf!23
-rw-r--r--meson.build3
1 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 43b11f61a..96e72de84 100644
--- a/meson.build
+++ b/meson.build
@@ -42,6 +42,7 @@ revision = gdk_pixbuf_interface_age
libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
age = gdk_pixbuf_binary_age - gdk_pixbuf_interface_age
current_minus_age = current - age
+darwin_versions = ['@0@'.format(current + 1), '@0@.@1@'.format(current + 1, gdk_pixbuf_interface_age)]
# Paths
gdk_pixbuf_prefix = get_option('prefix')
@@ -179,7 +180,7 @@ endif
if host_machine.system() == 'darwin'
# Maintain compatibility with autotools on macOS
- common_ldflags += [ '-compatibility_version 1', '-current_version 1.0', ]
+ common_ldflags += [ '-compatibility_version', darwin_versions[0], '-current_version', darwin_versions[1]]
gdk_pixbuf_conf.set('OS_DARWIN', 1)
endif