diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-25 21:27:10 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-26 11:39:37 -0400 |
| commit | 4dd7010c007c89497b0b684ee4dbf699c2be1ee4 (patch) | |
| tree | f5a3b2a64e3359dad71eccefa4ecaf653820e166 /connectivity | |
| parent | 406dfa3240249d3611743ec2cee1b644a3c56291 (diff) | |
don't build postgresql just to parse the makefiles
When running module-deps.pl postgresql gets built just so that
libpq-flags.mk can be included. Since we already have all the necessary
libraries, add them explicitly and avoid this.
Change-Id: Icd94fc215ecb26c95f9ae3c14625bf819bf3c5c3
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/Library_postgresql-sdbc-impl.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 37c40746c7cf..d733f01662ea 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -60,18 +60,21 @@ endif $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ boost_headers \ postgresql \ + openssl \ + openldap \ + nss3 \ + plc4 \ + ssl3 \ )) ifneq ($(SYSTEM_POSTGRESQL),YES) ifneq ($(OS)$(COM),WNTMSC) --include $(OUTDIR)/inc/postgresql/libpq-flags.mk - $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ - $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--as-needed) \ - $(LIBPQ_DEP_LIBS) \ + $(if $(filter YES,$(WITH_GSSAPI)),$(GSSAPI_LIBS)) \ + $(if $(filter YES,$(WITH_KRB5)),$(KRB5_LIBS)) \ $(if $(filter-out MACOSX,$(OS)),-ldl) \ - $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--no-as-needed) \ + $(if $(filter-out MACOSX,$(OS)),-lpthread) \ )) endif |