diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-12-28 11:19:06 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-31 20:13:20 +0000 |
| commit | 9ddba6644024254a348c3569835df6ffae8c985a (patch) | |
| tree | 7e48f8fdce73cf7a7766623b59e386ea684973b5 /postgresql | |
| parent | b4b6c459830ba6a070a813a533530feff3964ab0 (diff) | |
convert openssl to gbuild and add to tail_build
Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3
Reviewed-on: https://gerrit.libreoffice.org/1495
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'postgresql')
| -rw-r--r-- | postgresql/ExternalProject_postgresql.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index a0238529acc3..6b54253bfd00 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -13,6 +13,8 @@ $(eval $(call gb_ExternalProject_use_unpacked,postgresql,postgresql)) $(eval $(call gb_ExternalProject_use_package,postgresql,openldap)) +$(eval $(call gb_ExternalProject_use_external,postgresql,openssl)) + $(eval $(call gb_ExternalProject_register_targets,postgresql,\ build \ )) @@ -33,8 +35,11 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(WITH_KRB5)),--with-krb5) \ $(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi) \ + CPPFLAGS="$(if $(filter NO,$(SYSTEM_OPENLDAP)),\ + -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ + $(if $(filter NO,$(SYSTEM_OPENSSL)),\ + -I$(call gb_UnpackedTarball_get_dir,openssl/include))" \ $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ - CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,openldap/include)" \ LDFLAGS="-L$(OUTDIR)/lib" \ EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ ) \ |