RepositoryFixes.mk | 2 ++ solenv/gbuild/CliAssembly.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit 2589505cc299950a2d41aa65e0100fb0c6f0a7a6 Author: Michael Stahl <[email protected]> Date: Mon Oct 22 23:02:38 2012 +0200 fdo#55290: CliAssembly: fix cbd9dddb: s/NAME/OUTFILE/ Change-Id: I9339dee42ed564521f3d6bd4d269184e79e2303c diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index b6e216a..82e2f50 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -74,7 +74,7 @@ $(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir : $(call gb_CliAssemblyTarget_get_target,%) : $(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set)) $(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set)) - $(if $(strip $(CLI_ASSEMBLY_NAME)),,$(call gb_Output_error,assembly name not set)) + $(if $(strip $(CLI_ASSEMBLY_OUTFILE)),,$(call gb_Output_error,assembly name not set)) $(call gb_CliAssemblyTarget__command,$@,$*,$<) $(call gb_CliAssemblyTarget_get_assembly_target,%) : commit 8de04aaf23492fb0c188b063ecd806b2e6d9d213 Author: Michael Stahl <[email protected]> Date: Mon Oct 22 22:35:49 2012 +0200 mozilla import libraries have no "i" prefix ... how the heck did that ever work? Change-Id: Idfaf4d617f48427b144837ea44bee49ae8e3f0ff diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 74f7acb..5eb00eb 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -146,6 +146,8 @@ gb_Library_NOILIBFILENAMES := \ lcms2 \ pango-1.0 \ pangocairo-1.0 \ + xpcom \ + xpcom_core \ nspr4 \ nss3 \ smime3 \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
