[Libreoffice-commits] core.git: postgresql/ExternalProject_postgresql.mk

Michael Stahl mstahl at redhat.com
Mon Sep 23 10:34:48 PDT 2013


 postgresql/ExternalProject_postgresql.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab74f61f80beffee9aecf622d476205c13e8c245
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 23 19:31:05 2013 +0200

    postgresql: find libldap_r again
    
    ... so that's what the ldap_r was for that i removed in
    f33c8644c052bf9d69157224500ca7887075c7da.
    
    Change-Id: I8b913880fa32b2bf8566727af954a0ce0da4bba0

diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk
index 1cbaed0..9f495c5 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -42,7 +42,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
 			$(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\
 			-I$(call gb_UnpackedTarball_get_dir,openssl/include))" \
 			$(if $(filter NO,$(SYSTEM_OPENLDAP)), \
-			LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs -L$(OUTDIR)/lib" \
+			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" \
 			EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \
 			) \
 		&& cd src/interfaces/libpq \


More information about the Libreoffice-commits mailing list