.gitignore | 10 ++++------ external/firebird/ExternalProject_firebird.mk | 2 +- openldap/ExternalProject_openldap.mk | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-)
New commits: commit 6d95f2be8667765ee85b08bc0c8f64d8b6a768a9 Author: Michael Stahl <[email protected]> Date: Sat Oct 26 23:20:26 2013 +0200 firebird: find ICU libraries when running build tools Change-Id: I1966312b1f66295b8284195b7affee42faae03ce diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 7001c23..8bc87e5 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ && $(if $(filter WNT,$(OS)),\ - PATH="$(shell cygpath -u $(OUTDIR)/bin):$$PATH",\ + PATH="$(shell cygpath -u $(call gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\ $(gb_Helper_set_ld_path)) \ $(MAKE) firebird_embedded \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ commit 220be19271dc0baa4053086ef43fc0b4a4602586 Author: Michael Stahl <[email protected]> Date: Sat Oct 26 23:01:23 2013 +0200 openldap: find NSS libraries in WORKDIR Change-Id: Id5a5b93ed4439bda5fd25916c5fbda61434269b2 diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk index 8596354..66385e8 100644 --- a/openldap/ExternalProject_openldap.mk +++ b/openldap/ExternalProject_openldap.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,openldap,build) : , \ CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \ CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \ - LDFLAGS="-L$(OUTDIR)/lib $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)" \ + LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)" \ ) \ && MAKEFLAGS= && $(MAKE) \ ) commit 5c94caf12b1bd9702160a4c0be7e1f9bcbb2985c Author: Michael Stahl <[email protected]> Date: Sat Oct 26 23:13:36 2013 +0200 .gitignore: ignore "tags" Change-Id: I79dc9c9bb2ad299adb6b06b66410d12a9b77c3cd diff --git a/.gitignore b/.gitignore index d4526a9..fb97926 100644 --- a/.gitignore +++ b/.gitignore @@ -24,15 +24,9 @@ /workdir /solver -# these two are dubbious. when the installed is reworked -# it would be best to find them a new home -/instsetoo_native/util/LibreOffice -/instsetoo_native/util/LibreOffice_SDK - # where the external downloads maybe located /src - # autoconf generated stuff /aclocal.m4 /autom4te.cache @@ -57,6 +51,10 @@ /AUTHORS /MAINTAINERS +# make tags + +/tags + # backup and temporary editor files: the only convinience rules allowed here. *~ .*sw? _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
