diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 15:47:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 23:34:26 +0200 |
| commit | 3c38b7727a3deab37c5e9b822cec53c081e2b6e3 (patch) | |
| tree | 61b40e23ba463a235d7bc41028630a068f3c4fe2 /postgresql | |
| parent | e567baf92c0fc71e862a2cf07e029576ee36cd77 (diff) | |
zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
Diffstat (limited to 'postgresql')
| -rw-r--r-- | postgresql/ExternalProject_postgresql.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 76d5a01c112e..428ededc2457 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -11,7 +11,10 @@ $(eval $(call gb_ExternalProject_ExternalProject,postgresql)) $(eval $(call gb_ExternalProject_use_package,postgresql,openldap)) -$(eval $(call gb_ExternalProject_use_external,postgresql,openssl)) +$(eval $(call gb_ExternalProject_use_externals,postgresql,\ + openssl \ + zlib \ +)) $(eval $(call gb_ExternalProject_register_targets,postgresql,\ build \ @@ -34,8 +37,9 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(and $(filter YES,$(WITH_KRB5)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-krb5) \ $(if $(and $(filter YES,$(WITH_GSSAPI)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-gssapi) \ - CPPFLAGS="$(if $(filter NO,$(SYSTEM_OPENLDAP)),\ - -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ + CPPFLAGS="$(ZLIB_CFLAGS) \ + $(if $(filter NO,$(SYSTEM_OPENLDAP)),\ + -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\ -I$(call gb_UnpackedTarball_get_dir,openssl/include))" \ $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ |