[Libreoffice-commits] core.git: codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk idl/Executable_svidl.mk unoidl/Executable_unoidl-check.mk unoidl/Executable_unoidl-write.mk vcl/commonfuzzer.mk
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 2 18:59:10 UTC 2020
codemaker/Executable_cppumaker.mk | 4 ----
codemaker/Executable_javamaker.mk | 4 ----
idl/Executable_svidl.mk | 4 ----
unoidl/Executable_unoidl-check.mk | 4 ----
unoidl/Executable_unoidl-write.mk | 4 ----
vcl/commonfuzzer.mk | 1 -
6 files changed, 21 deletions(-)
New commits:
commit 2b03e0ba521b7b439e5da6ce73545dd4f2c49a8b
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Mar 2 19:58:07 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 2 19:58:35 2020 +0100
Revert "ofz#20976 build-failure"
This reverts commit 5b22433d79823372744038c5ae28094bc938fb48.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I4a104ca86dadbcc7f797df41326d48a53ca1c990
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89800
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index f81577b732b0..41ca490718d7 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,cppumaker))
$(eval $(call gb_Executable_use_external,cppumaker,boost_headers))
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_Executable_use_external,cppumaker,dtoa))
-endif
-
$(eval $(call gb_Executable_use_libraries,cppumaker,\
unoidl \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk
index 135860e87dfe..febfe9a71c29 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,javamaker))
$(eval $(call gb_Executable_use_external,javamaker,boost_headers))
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_Executable_use_external,javamaker,dtoa))
-endif
-
$(eval $(call gb_Executable_use_libraries,javamaker,\
unoidl \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index fe0933795392..98f447709a2c 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -21,10 +21,6 @@ $(eval $(call gb_Executable_Executable,svidl))
$(eval $(call gb_Executable_use_external,svidl,boost_headers))
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_Executable_use_external,svidl,dtoa))
-endif
-
$(eval $(call gb_Executable_set_include,svidl,\
$$(INCLUDE) \
-I$(SRCDIR)/idl/inc \
diff --git a/unoidl/Executable_unoidl-check.mk b/unoidl/Executable_unoidl-check.mk
index edd0d4b32aec..36dfc44de635 100644
--- a/unoidl/Executable_unoidl-check.mk
+++ b/unoidl/Executable_unoidl-check.mk
@@ -21,8 +21,4 @@ $(eval $(call gb_Executable_use_libraries,unoidl-check, \
sal \
))
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_Executable_use_external,unoidl-check,dtoa))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/unoidl/Executable_unoidl-write.mk b/unoidl/Executable_unoidl-write.mk
index 3ba2d9655563..9accb31ac14d 100644
--- a/unoidl/Executable_unoidl-write.mk
+++ b/unoidl/Executable_unoidl-write.mk
@@ -21,8 +21,4 @@ $(eval $(call gb_Executable_use_libraries,unoidl-write, \
sal \
))
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_Executable_use_external,unoidl-write,dtoa))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index fc66386759c2..b58a5bb5eccc 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -17,7 +17,6 @@ fuzzer_externals = \
boost_system \
boost_iostreams \
curl \
- dtoa \
harfbuzz \
graphite \
cairo \
More information about the Libreoffice-commits
mailing list