[Libreoffice-commits] core.git: solenv/gbuild

[Luboš Luňák (via logerrit)]

 solenv/gbuild/Module.mk |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a6bccaf72f69428bffd6688917491ef921383456
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri Sep 17 14:46:10 2021 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sun Sep 19 10:46:13 2021 +0200

    make "-external/" valid gbuild exclusion for FORCE_COMPILE
    
    Get the name of the directory extra level up, which is 'external'
    for external modules, and check that too.
    
    Change-Id: Ie9a3bffea0c64c07cf2e9dfa221fd27106a05443
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122307
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 9eddc41683a4..fcedbc95f248 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -249,12 +249,16 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize propex ulfex xrmex tr
 		&& touch $@)
 
 # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]
+# $(1) is module name, $(2) is directory name two levels up (for externals it's 'external')
 gb_Module__symbols_enabled = \
  $(and $(if $(filter -$(1)/,$(gb_ENABLE_SYMBOLS_FOR)),,$(true)),\
+       $(if $(filter -$(2)/,$(gb_ENABLE_SYMBOLS_FOR)),,$(true)),\
        $(filter all $(1)/,$(gb_ENABLE_SYMBOLS_FOR)))
 # enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]
+# $(1) is module name, $(2) is directory name two levels up (for externals it's 'external')
 gb_Module__force_compile = \
  $(and $(if $(filter -$(1)/,$(FORCE_COMPILE)),,$(true)),\
+       $(if $(filter -$(2)/,$(FORCE_COMPILE)),,$(true)),\
        $(filter all $(1)/,$(FORCE_COMPILE)))
 
 define gb_Module_Module
@@ -270,8 +274,8 @@ gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call gb_Module_get_subsequentcheck_tar
 gb_Module_STAGINGCHECKTARGETSTACK := $(call gb_Module_get_stagingcheck_target,$(1)) $(gb_Module_STAGINGCHECKTARGETSTACK)
 gb_Module_PERFCHECKTARGETSTACK := $(call gb_Module_get_perfcheck_target,$(1)) $(gb_Module_PERFCHECKTARGETSTACK)
 gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) $(gb_Module_CLEANTARGETSTACK)
-gb_Module_CURRENTMODULE_SYMBOLS_ENABLED := $(call gb_Module__symbols_enabled,$(1))
-gb_Module_CURRENTMODULE_FORCE_COMPILE := $(call gb_Module__force_compile,$(1))
+gb_Module_CURRENTMODULE_SYMBOLS_ENABLED := $(call gb_Module__symbols_enabled,$(1),$(notdir $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../)))
+gb_Module_CURRENTMODULE_FORCE_COMPILE := $(call gb_Module__force_compile,$(1),$(notdir $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../)))
 gb_Module_CURRENTMODULE_NAME := $(1)
 $(call gb_Helper_make_userfriendly_targets,$(1),Module)
 $(if $(filter-out libreoffice instsetoo_native android ios,$(1)),\