Commit 26e2a89598d69c7aba76c83f6a1fcf1db17574ab
2020-11-04T21:00:22
* meson.build: Fix .pc file generation. For backwards compatibility we need the libtool version, not the .so number. Reported by Nikolaus.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/ChangeLog b/ChangeLog
index 550fab5..f296352 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-11-04 Werner Lemberg <wl@gnu.org>
+
+ * meson.build: Fix .pc file generation.
+
+ For backwards compatibility we need the libtool version, not the .so
+ number.
+
+ Reported by Nikolaus.
+
2020-10-28 Werner Lemberg <wl@gnu.org>
[truetype] Minor update to forthcoming OpenType 1.8.4 standard.
diff --git a/meson.build b/meson.build
index c994976..c98fea6 100644
--- a/meson.build
+++ b/meson.build
@@ -32,11 +32,15 @@ ft2_version = run_command(python_exe,
files('builds/meson/extract_freetype_version.py'),
files('include/freetype/freetype.h')).stdout().strip()
-ft2_libtool_version = run_command(python_exe,
+ft2_so_version = run_command(python_exe,
files('builds/meson/extract_libtool_version.py'),
'--soversion',
files('builds/unix/configure.raw')).stdout().strip()
+ft2_libtool_version = run_command(python_exe,
+ files('builds/meson/extract_libtool_version.py'),
+ files('builds/unix/configure.raw')).stdout().strip()
+
ft2_includes = include_directories('include')
@@ -320,7 +324,7 @@ ft2_lib = library('freetype',
include_directories: ft2_includes,
dependencies: ft2_deps,
install: true,
- version: ft2_libtool_version,
+ version: ft2_so_version,
)
@@ -328,7 +332,7 @@ ft2_lib = library('freetype',
freetype2_dep = declare_dependency(
include_directories: ft2_includes,
link_with: ft2_lib,
- version: ft2_libtool_version)
+ version: ft2_so_version)
# NOTE: Using both `install_dir` and `subdir` doesn't seem to work below,