diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 19:28:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:33 +0200 |
| commit | 2f6261fa07e496439e4476d2be2c4c9bca9e6e52 (patch) | |
| tree | b4d42a82b581c1ab0c47d14eb2b066a191e2264b /postgresql | |
| parent | 8b4deabeedd09f5968fa90ae04209ded4a717f6f (diff) | |
find lots of external static libraries in UnpackedTarball dir
Note: do NOT put file paths to static libraries into FOO_LIBS variables
that are passed to bundled externals that are built with --enable-static:
on Mac OS X this will result in .a archives that contain other .a
archives as entries, and trying to link those results in errors like:
ld: warning: ignoring file .../libodfgen-0.0.a, file was built for
archive which is not the architecture being linked (i386)
Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24
Diffstat (limited to 'postgresql')
| -rw-r--r-- | postgresql/ExternalProject_postgresql.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 428ededc2457..1cbaed077c78 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -9,9 +9,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,postgresql)) -$(eval $(call gb_ExternalProject_use_package,postgresql,openldap)) - $(eval $(call gb_ExternalProject_use_externals,postgresql,\ + openldap \ openssl \ zlib \ )) @@ -43,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$(OUTDIR)/lib" \ + LDFLAGS="-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 \ |