diff options
author | Noel Grandin <noel@peralex.com> | 2022-02-15 11:08:15 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-02-15 11:19:43 +0100 |
commit | 224369b351884e8315368cfc99620c42eb97ee15 (patch) | |
tree | 03ba7ab05f37add2f79e010583a92640e41b0ae1 /config_host.mk.in | |
parent | 4246932611f99748684d05e6cbfd41e28430c5d2 (diff) |
revert component name changes to makefile
This reverts
commit 2483cd198b51bd5d0819cbebf40f211b2ef1236d
Author: Jan-Marek Glogowski <glogow@fbihome.de>
Date: Fri Feb 11 19:40:36 2022 +0100
Correctly depend on source component file
and
commit 17ec55c48082254e1f55bcfa00808e45a50a9801
Author: Jan-Marek Glogowski <glogow@fbihome.de>
Date: Thu Jan 20 10:06:54 2022 +0100
Fail on non-optional, but filtered component names
because they cause failures on Windows builds that look
like:
warning: failed to load external entity "C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows@2/workdir/ComponentTarget/binaryurp/source/binaryurp.component"
cannot process C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows@2/workdir/ComponentTarget/binaryurp/source/binaryurp.component
Change-Id: Ia34cdabd76b47a6a4686ebd0f96ceb774d3236f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129956
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'config_host.mk.in')
-rw-r--r-- | config_host.mk.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 3aee8c0f84bb..dee4375023fc 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -124,7 +124,6 @@ export DCONF_CFLAGS=@DCONF_CFLAGS@ export DCONF_LIBS=@DCONF_LIBS@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ -export DIFF=@DIFF@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ export DISABLE_PYTHON=@DISABLE_PYTHON@ |