minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* meson.build: Fix .pc file generation. 

For backwards compatibility we need the libtool version, not the .so
number.

Reported by Nikolaus.
This commit is contained in:
Werner Lemberg 2020-11-04 21:00:22 +01:00
parent 0bd50c9043
commit 26e2a89598
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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.

10
meson.build
View File

@ -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,