openldap/ExternalProject_openldap.mk | 2 - postgresql/ExternalProject_postgresql.mk | 32 +++++++++++++++++++++++-------- solenv/gbuild/UnoApi.mk | 2 - 3 files changed, 26 insertions(+), 10 deletions(-)
New commits: commit 90d7723085a8da0929c7c17587a7717ceeb23d36 Author: Michael Stahl <[email protected]> Date: Sun Oct 27 00:47:10 2013 +0200 postgresql: find both openssl and NSS libraries in their hiding places Change-Id: I626bf288cb7375af1445bf86f5559a5587324e5d diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk index 66385e8..36c844c 100644 --- a/openldap/ExternalProject_openldap.mk +++ b/openldap/ExternalProject_openldap.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,openldap)) -$(eval $(call gb_ExternalProject_use_package,openldap,nss)) +$(eval $(call gb_ExternalProject_use_externals,openldap,nss3)) $(eval $(call gb_ExternalProject_register_targets,openldap,\ build \ diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 7690357..afa7ff3 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -28,6 +28,28 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : else +postgresql_CPPFLAGS := $(ZLIB_CFLAGS) +postgresql_LDFLAGS := + +ifeq ($(DISABLE_OPENSSL),) +ifeq ($(SYSTEM_OPENSSL),NO) +postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include +postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/ +endif +endif + +ifeq ($(SYSTEM_OPENLDAP),NO) +postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openldap)/include +postgresql_LDFLAGS += \ + -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \ + -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \ + -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \ + $(if $(filter NO,$(SYSTEM_NSS)),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib) \ + +endif + + $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ ./configure \ @@ -36,15 +58,9 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(if $(DISABLE_OPENSSL),,--with-openssl \ $(if $(filter YES,$(WITH_KRB5)), --with-krb5) \ $(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi)) \ - CPPFLAGS="$(ZLIB_CFLAGS) \ - $(if $(filter NO,$(SYSTEM_OPENLDAP)),\ - -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ - $(if $(DISABLE_OPENSSL),,$(if $(filter NO,$(SYSTEM_OPENSSL)),\ - -I$(call gb_UnpackedTarball_get_dir,openssl/include)))" \ - $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ - LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs -L$(OUTDIR)/lib" \ + CPPFLAGS="$(postgresql_CPPFLAGS)" \ + LDFLAGS="$(postgresql_LDFLAGS)" \ EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ - ) \ && cd src/interfaces/libpq \ && MAKEFLAGS= && $(MAKE) all-static-lib) commit c4bf336f658dea0cbbe5a907d4e921bcac3b8f6a Author: Michael Stahl <[email protected]> Date: Sat Oct 26 23:44:51 2013 +0200 gbuild: fix spurious re-delivery of .rdb files Order-only dependency from INSTDIR target to IDL Package is enough; the Package depends on the WORKDIR .rdb and deliver preserves timestamps... Change-Id: I060f7f27b543d9cc93658c93d472a933a18a6952 diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 9595815..69ae8a9 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -42,7 +42,7 @@ ifneq ($(gb_UnoApi_ENABLE_INSTALL),) # # gb_UnoApi_package_idlfiles api define gb_UnoApi_package_idlfiles -$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) +$(call gb_UnoApi_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_idl) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl) endef _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
