strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gbuild: treat $(DCONF_CFLAGS) as includes, not defines

Browse source 
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
4aa6049062
("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@posteo.de>
This commit is contained in:
Michael Weghorn 2019-09-30 15:08:30 +00:00
parent 981654f6e0
commit 2d4bb24588
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
RepositoryExternal.mk
View file

@ -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