diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-12-15 13:16:00 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-12-15 16:46:48 +0200 |
| commit | 3e973760b788c49396c7a18404bffa0505e65a04 (patch) | |
| tree | 0606a4a253b055f3484b27640f4f0390351f4c70 | |
| parent | 5ed995fabbd90cd4274b857f15fa153b3b3821ff (diff) | |
Build HarfBuzz with CoreText support also for iOS
Change-Id: Id755894def35d59836dff8cff7df1273a8e296b2
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 2 | ||||
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 4 | ||||
| -rw-r--r-- | external/harfbuzz/harfbuzz-ios.patch | 11 |
3 files changed, 16 insertions, 1 deletions
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index ea0635d4c318..dbd88de37573 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : --with-cairo=no \ --with-glib=no \ --with-graphite2=yes \ - $(if $(filter MACOSX,$(OS)),--with-coretext=yes) \ + $(if $(filter IOS MACOSX,$(OS)),--with-coretext=yes) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ CXXFLAGS=' \ diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 7d408d2a2348..888251f1187f 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -24,4 +24,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ )) endif +$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ + external/harfbuzz/harfbuzz-ios.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/harfbuzz-ios.patch b/external/harfbuzz/harfbuzz-ios.patch new file mode 100644 index 000000000000..2c8e7df73b19 --- /dev/null +++ b/external/harfbuzz/harfbuzz-ios.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -19046,6 +19046,8 @@ + + else + # On iOS CoreText and CoreGraphics are stand-alone frameworks ++ # Forget the cache failure to find CTFontRef above ++ unset ac_cv_type_CTFontRef + if test "x$have_coretext" != "xtrue"; then + ac_fn_c_check_type "$LINENO" "CTFontRef" "ac_cv_type_CTFontRef" "#include <CoreText/CoreText.h> + " |