[Libreoffice-commits] core.git: RepositoryExternal.mk

[Michael Weghorn (via logerrit)]

 RepositoryExternal.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2d4bb24588dc872ba856dd4430541e0e0a641b7e
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Sep 30 15:08:30 2019 +0000
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Oct 1 07:44:10 2019 +0200

    gbuild: treat $(DCONF_CFLAGS) as includes, not defines
    
    Since that variable holds the relevant includes, using
    'gb_LinkTarget_set_include' makes sure that those
    flags end up in the correct section, e.g. when generating
    IDE integration using 'gbuild-to-ide', and thus prevents
    issues like that described in
    4aa60490622cc10f8d3a31489c62a5622d240c83
    ("gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines").
    
    (Value of 'DCONF_CFLAGS' variable on Debian testing with
    'libdconf-dev' 0.34.0-1 is:
    
        DCONF_CFLAGS=-pthread -I/usr/include/dconf -I/usr/include/libmount
                              -I/usr/include/blkid -I/usr/include/glib-2.0
                              -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
    )
    
    Change-Id: I74c5194d88838bffa2b8515372266336627f235c
    Reviewed-on: https://gerrit.libreoffice.org/79874
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4d99f79e86ec..5ce23a10c6db 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3589,7 +3589,11 @@ gb_LinkTarget__use_libgpg-error :=
 endif # ENABLE_GPGMEPP
 
 define gb_LinkTarget__use_dconf
-$(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
+$(call gb_LinkTarget_set_include,$(1),\
+		$$(INCLUDE) \
+		$(DCONF_CFLAGS) \
+)
+
 $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
 endef