external/freetype/ExternalPackage_freetype.mk | 16 ---------------- external/freetype/ExternalProject_freetype.mk | 5 +---- external/freetype/Module_freetype.mk | 1 - external/freetype/UnpackedTarball_freetype.mk | 1 - external/freetype/libfreetype-bundled-soname.patch.0 | 11 ----------- 5 files changed, 1 insertion(+), 33 deletions(-)
New commits: commit dd522fc58e37b149c7e31bad931e82b72c9f4db5 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Wed Oct 12 17:22:30 2022 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Wed Oct 12 17:34:54 2022 +0200 No need to build bundled freetype as shared even with the fd hack Change-Id: I1aea8ecf55aafbcb68d2cd99f57756d18bc2c4d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141258 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/external/freetype/ExternalPackage_freetype.mk b/external/freetype/ExternalPackage_freetype.mk deleted file mode 100644 index 4709c60415c0..000000000000 --- a/external/freetype/ExternalPackage_freetype.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,freetype,freetype)) - -$(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype)) - -$(eval $(call gb_ExternalPackage_add_file,freetype,$(LIBO_LIB_FOLDER)/libfreetype-lo.so.6.18.0,instdir/lib/libfreetype-lo.so.6.18.0)) - -# vim: set noet sw=4 ts=4: diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 8cf533d8dfb4..4cb2920ae923 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -17,10 +17,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : $(call gb_Trace_StartRange,freetype,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(gb_RUN_CONFIGURE) ./configure \ - $(if $(filter LINUX,$(OS)), \ - --disable-static, \ - --disable-shared \ - ) \ + --disable-shared \ --with-pic \ --without-zlib \ --without-brotli \ diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index 8552511e1674..290014c47dfd 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,freetype)) $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \ UnpackedTarball_freetype \ - $(if $(filter LINUX,$(OS)),ExternalPackage_freetype) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/freetype/UnpackedTarball_freetype.mk b/external/freetype/UnpackedTarball_freetype.mk index c4c2da5a28fa..0b521cb934d0 100644 --- a/external/freetype/UnpackedTarball_freetype.mk +++ b/external/freetype/UnpackedTarball_freetype.mk @@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL),,freet $(eval $(call gb_UnpackedTarball_add_patches,freetype,\ external/freetype/freetype-2.6.5.patch.1 \ external/freetype/freetype-fd-hack.patch.0 \ - external/freetype/libfreetype-bundled-soname.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/freetype/libfreetype-bundled-soname.patch.0 b/external/freetype/libfreetype-bundled-soname.patch.0 deleted file mode 100644 index 5b864be562b8..000000000000 --- a/external/freetype/libfreetype-bundled-soname.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ -# -*- Mode: Diff -*- ---- builds/unix/unix-cc.in -+++ builds/unix/unix-cc.in -@@ -123,6 +123,7 @@ - LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ - -rpath $(libdir) -version-info $(version_info) \ - $(LDFLAGS) -no-undefined \ -+ -release lo -Wl,-soname -Wl,libfreetype-lo.so.6.18.0 \ - -export-symbols $(EXPORTS_LIST) - - # EOF