[HARFBUZZ] Always statically build harfbuzz.

This commit is contained in:
James Walmsley 2022-06-27 21:20:30 +01:00
Родитель ea55610178
Коммит c86dbdd736
4 изменённых файлов: 29 добавлений и 17 удалений

Просмотреть файл

@ -3,9 +3,18 @@ include $(DEFINE_LAYER)
HARFBUZZ_GIT_REF?=4.2.1 HARFBUZZ_GIT_REF?=4.2.1
$(call git_clone, harfbuzz, https://github.com/harfbuzz/harfbuzz.git, $(HARFBUZZ_GIT_REF)) $(call git_clone, harfbuzz, https://github.com/harfbuzz/harfbuzz.git, $(HARFBUZZ_GIT_REF))
$(call meson, harfbuzz)
HARFBUZZ_OPTIONS:=-Dtests=disabled
ifdef WINDOWS
HARFBUZZ_OPTIONS += -Db_vscrt=mt -Ddefault_library=static
endif
$(call meson, harfbuzz, $(HARFBUZZ_OPTIONS))
include $(BUILD_LAYER) include $(BUILD_LAYER)

Просмотреть файл

@ -34,6 +34,7 @@ $(L) += $(skia_cmake)
DEPENDS += fontconfig DEPENDS += fontconfig
DEPENDS += harfbuzz
include $(BUILD_LAYER) include $(BUILD_LAYER)
@ -110,12 +111,14 @@ ifndef WINDOWS
cp -rv $(srcdir)/skia/include $(PKGROOT)/$(PREFIX)/include/skia cp -rv $(srcdir)/skia/include $(PKGROOT)/$(PREFIX)/include/skia
cp $(builddir)/skia/libskia.a $(SYSROOT)/$(PREFIX)/$(LIBDIR)/ cp $(builddir)/skia/libskia.a $(SYSROOT)/$(PREFIX)/$(LIBDIR)/
cp $(builddir)/skia/libskia.a $(PKGROOT)/$(PREFIX)/$(LIBDIR)/ cp $(builddir)/skia/libskia.a $(PKGROOT)/$(PREFIX)/$(LIBDIR)/
cp $(SYSROOT)/$(PREFIX)/$(LIBDIR)/libharfbuzz.a $(PKGROOT)/$(PREFIX)/$(LIBDIR)/
cp -r $(SYSROOT)/$(PREFIX)/include/harfbuzz $(PKGROOT)/$(PREFIX)/include/
else else
mkdir -p $(PKGROOT)/$(PREFIX)/include/skia mkdir -p $(PKGROOT)/$(PREFIX)/include/skia
mkdir -p $(PKGROOT)/$(PREFIX)/$(LIBDIR) mkdir -p $(PKGROOT)/$(PREFIX)/$(LIBDIR)
cp -rv $(srcdir)/skia/include $(PKGROOT)/$(PREFIX)/include/skia cp -rv $(srcdir)/skia/include $(PKGROOT)/$(PREFIX)/include/skia
cp $(builddir)/skia/skia.lib $(PKGROOT)/$(PREFIX)/$(LIBDIR)/ cp $(builddir)/skia/skia.lib $(PKGROOT)/$(PREFIX)/$(LIBDIR)/
cp $(SYSROOT)/lib/libharfbuzz.a $(PKGROOT)/$(PREFIX)/$(LIBDIR)/ cp $(SYSROOT)/$(LIBDIR)/libharfbuzz.a $(PKGROOT)/$(PREFIX)/$(LIBDIR)/
cp -r $(SYSROOT)/include/harfbuzz $(PKGROOT)/$(PREFIX)/include/ cp -r $(SYSROOT)/include/harfbuzz $(PKGROOT)/$(PREFIX)/include/
endif endif
$(stamp) $(stamp)
@ -132,7 +135,7 @@ endif
$(skia_cmake): $(skia_install) $(skia_cmake): $(skia_install)
cp $(BASE_skia)/skia.cmake.in $@ cp $(BASE_skia)/skia.cmake.in $@
echo "set(SKIA_PREFIX $(PREFIX))" > $@ echo "set(SKIA_PREFIX $(PREFIX))" > $@
echo "set(SKIA_LIBDIR $(PREFIX)/lib64)" >> $@ echo "set(SKIA_LIBDIR $(PREFIX)/$(LIBDIR))" >> $@
for def in $(shell cat $(skia_describe)) ; do \ for def in $(shell cat $(skia_describe)) ; do \
echo "list(APPEND SKIA_COMPILE_DEFINES -D$${def})" >> $@ ; \ echo "list(APPEND SKIA_COMPILE_DEFINES -D$${def})" >> $@ ; \
done done

Просмотреть файл

@ -10,26 +10,26 @@ SYSROOT?=$(OUT)/buildroot
# #
PKGROOT?=$(OUT)/sysroot PKGROOT?=$(OUT)/sysroot
ifeq ($(CC),cc)
ifneq ($(shell which gcc-10 2> /dev/null),) PREFIX:=usr/local
export CC:=gcc-10 LIBDIR:=lib
export CXX:=g++-10
endif
endif
CLANG?=clang-13 CLANG?=clang-13
CLANGXX?=clang++-13 CLANGXX?=clang++-13
ifdef WINDOWS ifdef WINDOWS
export CC:=cl export CC:=cl
export CXX:=cl export CXX:=cl
else
ifeq ($(CC),cc)
ifneq ($(shell which gcc-10 2> /dev/null),)
export CC:=gcc-10
export CXX:=g++-10
endif
endif
HOST:=$(shell $(CC) -dumpmachine)
endif endif
HOST:=$(shell $(CC) -dumpmachine)
PREFIX:=usr/local
LIBDIR:=lib
ifeq ($(HOST),x86_64-linux-gnu) ifeq ($(HOST),x86_64-linux-gnu)
LIBDIR:=lib64 LIBDIR:=lib64
endif endif

@ -1 +1 @@
Subproject commit a273b1bb30b487495841863298e6e7c9f281bab4 Subproject commit 76da1b6c04f4e47db204a397573a29fdd01798b2