RepositoryExternal.mk | 23 ++++++----------------
configure.ac | 3 ++
external/fontconfig/ExternalProject_fontconfig.mk | 4 +--
external/harfbuzz/ExternalProject_harfbuzz.mk | 1
4 files changed, 13 insertions(+), 18 deletions(-)
New commits:
commit a7b9eb7e0fb782d2deac0b10b75229852dad7a62
Author: David Tardon <dtar...@redhat.com>
Date: Thu Feb 2 15:01:34 2017 +0100
workaround libtool library name subst.
When libtool links a library with another libtool-based library, it
replaces -lfoo by path to installed foo, like $foo-libdir/libfoo.la.
harfbuzz would be installed to /usr/local/lib by default, therefore
libtool replaces -lharfbuzz by /usr/local/lib/libharfbuzz.la in
libfreetype.la, which causes a failure (nonexistent file) when building
fontconfig...
Change-Id: Ie2510034e69803af084dd90671fdbc8f6863fcf2
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index dbd88de..53490ab 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--with-graphite2=yes \
$(if $(filter IOS MACOSX,$(OS)),--with-coretext=yes) \
$(if
$(verbose),--disable-silent-rules,--enable-silent-rules) \
+ --libdir=$(call
gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
CXXFLAGS=' \
$(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
commit a84c22107e618f18503abdda063273c2151c24f3
Author: David Tardon <dtar...@redhat.com>
Date: Thu Feb 2 15:00:37 2017 +0100
build only fontconfig lib
Change-Id: I4fbbd7dfc828e4e38bd59feb93b02fcd6daa74a5
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk
b/external/fontconfig/ExternalProject_fontconfig.mk
index 39beaf4..32fc03f 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
--with-expat-includes=$(call
gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
- && $(MAKE) \
+ && $(MAKE) -C src \
)
# vim: set noet sw=4 ts=4:
commit 038844ad1a37c8256eeba472f396912617073299
Author: David Tardon <dtar...@redhat.com>
Date: Thu Feb 2 13:41:42 2017 +0100
run verbose make for fontconfig
Change-Id: I67055b9cf325b71b0f227b59d94158c334dc724b
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk
b/external/fontconfig/ExternalProject_fontconfig.mk
index 0fa3364..39beaf4 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -23,6 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter
ANDROID,$(OS)),LIBS="-lm") \
./configure \
--disable-shared \
+ --disable-silent-rules \
$(if $(filter ANDROID,$(OS)),--with-arch=arm) \
--with-expat-includes=$(call
gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
commit e060317a7a4f56fd04f5812ff8231455be521505
Author: David Tardon <dtar...@redhat.com>
Date: Thu Feb 2 13:31:13 2017 +0100
fontconfig uses pkg-config to detect freetype now
Change-Id: I12cc3a8a36aeafd5184eee4051bc798c22769d8c
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b00776c..ed4ca9c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1266,12 +1266,6 @@ $(call gb_LinkTarget_set_include,$(1),\
endef
-define gb_LinkTarget__use_freetype
-$(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
-
-endef
-
gb_ExternalProject__use_freetype :=
else
@@ -1279,21 +1273,12 @@ else
define gb_LinkTarget__use_freetype_headers
$(call gb_LinkTarget_use_external_project,$(1),freetype)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,freetype)/include \
+ $(FREETYPE_CFLAGS) \
$$(INCLUDE) \
)
endef
-define gb_LinkTarget__use_freetype
-$(call gb_LinkTarget_use_external,$(1),freetype_headers)
-
-$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,freetype)/instdir/lib -lfreetype \
-)
-
-endef
-
define gb_ExternalProject__use_freetype
$(call gb_ExternalProject_use_external_project,$(1),freetype)
@@ -1301,6 +1286,12 @@ endef
endif # SYSTEM_FREETYPE
+define gb_LinkTarget__use_freetype
+$(call gb_LinkTarget_use_external,$(1),freetype_headers)
+$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
+
+endef
+
ifneq ($(SYSTEM_FONTCONFIG),)
define gb_LinkTarget__use_fontconfig
diff --git a/configure.ac b/configure.ac
index 45d9328..7ab1286 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7925,6 +7925,9 @@ if test "$test_freetype" = "yes"; then
FilterLibs "${FREETYPE_LIBS}"
FREETYPE_LIBS="${filteredlibs}"
SYSTEM_FREETYPE=TRUE
+else
+ FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
+ FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib
-lfreetype"
fi
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk
b/external/fontconfig/ExternalProject_fontconfig.mk
index 83387e3..0fa3364 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
$(if $(filter ANDROID,$(OS)),--with-arch=arm) \
--with-expat-includes=$(call
gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
- --with-freetype-config=$(call
gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
&& $(MAKE) \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
