Hi Peter, On Saturday, 2013-03-23 21:01:45 +0000, Peter Foley (via Code Review) wrote:
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1081,9 +1081,11 @@
endif
define gb_LinkTarget__use_icu_headers
-$(call gb_LinkTarget_use_package,$(1),icu)
+$(call gb_LinkTarget_use_unpacked,$(1),icu)
$(call gb_LinkTarget_set_include,$(1),\
- $(ISYSTEM)$(OUTDIR)/inc/external \
+ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source \
+ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
+ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/common \
$$(INCLUDE) \
)
I'm not convinced of this change and the corresponding removal of all to-be-delivered header files in icu/ExternalPackage_icu.mk Doing so gives access to almost all icu header files, including the internal ones, whereas previously only those were delivered that icu would also install in a real installation, namely source/layout/* -> layout/* and source/common/unicode/* -> unicode/* and source/i18n/unicode/* -> unicode/* I'd much prefer if we found a different solution for this. @All: Shouldn't we actually install external libraries into our workdir for such purposes? We'd then have a clean set of what a package thinks should be installed. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack
Attachment:
pgpPH1eUUcqqr.pgp
Description: PGP signature