mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix postgresql build

Browse Source 
Change-Id: I379029dbf600769e415582aa7162f320e707c3da
This commit is contained in:
Peter Foley
2013-03-26 14:11:18 -04:00
parent ca9435ecbb
commit 3326a85ae6
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/module-deps.pl
View File

@@ -163,6 +163,7 @@ sub prune_redundant_deps($)
sub create_lib_module_map() sub create_lib_module_map()
{ {
my %l2m; my %l2m;
$l2m{'merged'} = 'merged';
for (glob($src_root."/*/Library_*.mk")) for (glob($src_root."/*/Library_*.mk"))
{ {
/.*\/(.*)\/Library_(.*)\.mk/; /.*\/(.*)\/Library_(.*)\.mk/;

2
connectivity/Library_postgresql-sdbc-impl.mk
View File

@@ -61,7 +61,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
boost_headers \ boost_headers \
postgresql \ postgresql \
openssl \ openssl \
openldap \ $(if $(SYSTEM_OPENLDAP),openldap) \
nss3 \ nss3 \
plc4 \ plc4 \
ssl3 \ ssl3 \

3
postgresql/ExternalPackage_postgresql.mk
View File

@@ -24,8 +24,5 @@ else
$(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\ $(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
src/interfaces/libpq/libpq.a \ src/interfaces/libpq/libpq.a \
)) ))
$(eval $(call gb_ExternalPackage_add_files,postgresql,inc/postgresql,\
src/interfaces/libpq/libpq-flags.mk \
))
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

10
solenv/gbuild/LinkTarget.mk
View File

@@ -826,15 +826,15 @@ $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Librar
$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) $$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
endif endif
# used by bin/module-deps.pl
ifneq ($(ENABLE_PRINT_DEPS),)
$$(eval $$(call gb_PrintDeps_info,$(1),$(2),$(3),$(4)))
endif
gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \ gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \
$(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))),, merged)) \ $(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))),, merged)) \
$(filter-out $(gb_MERGEDLIBS),$(2)) $(filter-out $(gb_MERGEDLIBS),$(2))
# used by bin/module-deps.pl
ifneq ($(ENABLE_PRINT_DEPS),)
$$(eval $$(call gb_PrintDeps_info,$(1),$$(gb_LINKED_LIBS),$(3),$(4)))
endif
$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $$(gb_LINKED_LIBS) $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $$(gb_LINKED_LIBS)
$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_target,$$(lib))) $(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_target,$$(lib)))