Library_urelibs.mk | 5 +++++
i18npool/Library_i18npool.mk | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 3377167bc7bb1dc2ab8010d4bc09824b8492367a
Author: Peter Foley <pefol...@verizon.net>
Date: Wed Apr 10 18:08:37 2013 -0400
supress warnings from icu-generated headers
Change-Id: Ibbf0c1148cf8ea37bb51e6c31d2e89efc9dfce00
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 9056fb9..955579f 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -148,7 +148,8 @@ $(call
gb_CxxObject_get_target,i18npool/source/collator/collator_unicode) :| \
$(eval $(call gb_Library_add_generated_cobjects,i18npool,\
CustomTarget/i18npool/breakiterator/OpenOffice_dat \
$(foreach txt,$(wildcard
$(SRCDIR)/i18npool/source/breakiterator/data/*.txt),\
- CustomTarget/i18npool/breakiterator/$(notdir $(basename
$(txt)))_brk) \
+ CustomTarget/i18npool/breakiterator/$(notdir $(basename
$(txt)))_brk),\
+ $(if $(filter GCC,$(COM)),-Wno-unused-macros) \
))
# i18npool dlopens localedata_* libraries.
commit 23aaabc2b5bcda9858863a8defb3f226c9511a75
Author: Peter Foley <pefol...@verizon.net>
Date: Wed Apr 10 18:00:31 2013 -0400
fix urelibs w/ module-deps.pl
Change-Id: Ib293b8c0a1130a693f26e91b3d708c1933495c82
diff --git a/Library_urelibs.mk b/Library_urelibs.mk
index 64089f3..9fd9b78 100644
--- a/Library_urelibs.mk
+++ b/Library_urelibs.mk
@@ -14,6 +14,11 @@ $(eval $(call gb_Library_use_library_objects,urelibs,\
$(gb_URELIBS) \
))
+# needed to generate proper deps for module-deps.pl
+$(eval $(call gb_Library_use_libraries,urelibs,\
+ $(gb_UWINAPI) \
+))
+
$(eval $(call gb_Library_use_static_libraries,urelibs,\
findsofficepath \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
