diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-07-03 13:46:38 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-07-03 13:49:20 +0200 |
| commit | 025952f52767fb3508a6725468fe4b1e6ce4c9b1 (patch) | |
| tree | a759ba29c5f60ab221f6fe03e752f9bfef3cc613 /RepositoryExternal.mk | |
| parent | 7eb863d6b6258f31343d4b0b82038afe5e036bc0 (diff) | |
online update: Make the 'updater' build & link at least on Linux.
Works with the non-system bzip2; the --with-system case might still need some
love - but then again, distros want to have the online update switched off
anyway...
Change-Id: I26a27aec07a8f1aac22a4d14a38fb5b833550ea7
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0592dea01200..a556c3dc378e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4131,16 +4131,19 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_add_libs,$(1),$(BZIP2_LIBS)) endef + gb_ExternalProject__use_bzip2 := else # !SYSTEM_BZIP2 define gb_LinkTarget__use_bzip2 -$(call gb_LinkTarget_use_external_project,$(1),bzip2) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,bzip2) \ $$(INCLUDE) \ ) +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,bzip2) -lbz2 \ +) endef define gb_ExternalProject__use_bzip2 |