From 35bc9668567a8c61763715f0854a42324dc5a4f4 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Fri, 23 Dec 2016 23:22:25 +0100 Subject: Remove package with dbghelp.dll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ENABLE_CRASHDUMP is always empty. dbghelp.dll was removed from scp2 in 8ab4d2f29fdd2c058db23f6ee7b2200655d4c6f6 Change-Id: I5c47ce4b4cafb2f24185ddd9a31eb1a3176fa176 Reviewed-on: https://gerrit.libreoffice.org/32395 Tested-by: Jenkins Reviewed-by: Matúš Kukan --- Makefile.fetch | 1 - Repository.mk | 1 - configure.ac | 7 ------- download.lst | 1 - external/msc-externals/Module_msc-externals.mk | 1 - external/msc-externals/Package_dbghelp.mk | 14 -------------- 6 files changed, 25 deletions(-) delete mode 100644 external/msc-externals/Package_dbghelp.mk diff --git a/Makefile.fetch b/Makefile.fetch index cf31e5b3bfc0..db62719874b1 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -214,7 +214,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,ZMF,ZMF_TARBALL) \ ,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ - $(call fetch_Optional,DBGHELP,DBGHELP_DLL) \ $(call fetch_Optional,ODK,UNOWINREG_DLL) \ $(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \ $(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \ diff --git a/Repository.mk b/Repository.mk index 8e296ecc399b..8305c97b3bbf 100644 --- a/Repository.mk +++ b/Repository.mk @@ -774,7 +774,6 @@ endif $(eval $(call gb_Helper_register_packages, \ test_unittest \ cli_basetypes_copy \ - $(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \ desktop_install \ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ extras_fonts \ diff --git a/configure.ac b/configure.ac index 6fc14875a4bf..79e643b21df8 100644 --- a/configure.ac +++ b/configure.ac @@ -3652,13 +3652,6 @@ AC_SUBST(ENABLE_DIRECTX) AC_SUBST(DISABLE_ACTIVEX) AC_SUBST(DISABLE_ATL) -# -# dbghelp.dll -# -if test "$_os" = "WINNT"; then - BUILD_TYPE="$BUILD_TYPE DBGHELP" -fi - # # unowinreg.dll # diff --git a/download.lst b/download.lst index 31ec1ce616ee..da570965a819 100644 --- a/download.lst +++ b/download.lst @@ -26,7 +26,6 @@ export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt export CURL_MD5SUM := 490e19a8ccd1f4a244b50338a0eb9456 export CURL_TARBALL := curl-7.51.0.tar.gz -export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2 export EPOXY_MD5SUM := 96f6620a9b005a503e7b44b0b528287d diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk index 002dcf5cc0b9..789c7bd119ab 100644 --- a/external/msc-externals/Module_msc-externals.mk +++ b/external/msc-externals/Module_msc-externals.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,msc-externals)) $(eval $(call gb_Module_add_targets,msc-externals,\ - $(if $(ENABLE_CRASHDUMP),Package_dbghelp) \ Package_msvc_dlls \ )) diff --git a/external/msc-externals/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk deleted file mode 100644 index d039b07d42a5..000000000000 --- a/external/msc-externals/Package_dbghelp.mk +++ /dev/null @@ -1,14 +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_Package_Package,dbghelp,$(TARFILE_LOCATION))) - -$(eval $(call gb_Package_add_file,dbghelp,$(LIBO_LIB_FOLDER)/dbghelp.dll,$(DBGHELP_DLL))) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: -- cgit