Skip to content

Commit ed739d1

Browse files
committed
Merge bitcoin/bitcoin#29880: depends: build FreeType with CMake
ff4f3de depends: use CMake to build FreeType (fanquake) Pull request description: Switches Freetype to be built with CMake. ACKs for top commit: theuni: ACK ff4f3de hebasto: ACK ff4f3de, I've verified the actual compile options, they look sane. Tree-SHA512: e9e4348975998539fde88a84d110d53dbac50ae9cc3fa692d15e09313d6fdb6acb3bb23533786a645fc836091075b4487d6de42ef78ba3a44de46d06360aef4f
2 parents ec74f45 + ff4f3de commit ed739d1

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

depends/packages/freetype.mk

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ $(package)_version=2.11.0
33
$(package)_download_path=https://download.savannah.gnu.org/releases/$(package)
44
$(package)_file_name=$(package)-$($(package)_version).tar.xz
55
$(package)_sha256_hash=8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
6+
$(package)_build_subdir=build
67

78
define $(package)_set_vars
8-
$(package)_config_opts=--without-zlib --without-png --without-harfbuzz --without-bzip2 --disable-static
9-
$(package)_config_opts += --enable-option-checking --without-brotli
9+
$(package)_config_opts := -DCMAKE_BUILD_TYPE=None -DBUILD_SHARED_LIBS=TRUE
10+
$(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE
11+
$(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE
12+
$(package)_config_opts += -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE
1013
endef
1114

1215
define $(package)_config_cmds
13-
$($(package)_autoconf)
16+
$($(package)_cmake) -S .. -B .
1417
endef
1518

1619
define $(package)_build_cmds
@@ -22,5 +25,5 @@ define $(package)_stage_cmds
2225
endef
2326

2427
define $(package)_postprocess_cmds
25-
rm -rf share/man lib/*.la
28+
rm -rf share/man
2629
endef

0 commit comments

Comments
 (0)