diff options
| author | David Tardon <dtardon@redhat.com> | 2017-02-02 15:01:34 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-02-02 16:22:44 +0100 |
| commit | a7b9eb7e0fb782d2deac0b10b75229852dad7a62 (patch) | |
| tree | 8ceceb8169a81171e215dd88db43628e0244fb61 /external | |
| parent | a84c22107e618f18503abdda063273c2151c24f3 (diff) | |
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
Diffstat (limited to 'external')
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index dbd88de37573..53490abc2eaa 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)) \ |