diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-03 15:58:08 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-11-03 15:58:08 +0100 |
| commit | 43532a0944b0ee4727ea2ae480e54687e41d9201 (patch) | |
| tree | f0aee51ea1a41f1be3b9181b027f73b89f4f4d74 /RepositoryExternal.mk | |
| parent | a30f969432a451ade87b93e3077836a849b8f11b (diff) | |
RepositoryExternal.mk: fix poppler linking on Ubuntu
need to link poppler static library *before* jpeg
Change-Id: I0fd2abc12c93432715a02a3a567349abda4f990b
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b3fbeba458d7..e4f592df1a6d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2771,7 +2771,6 @@ endef else # !SYSTEM_POPPLER define gb_LinkTarget__use_poppler -$(call gb_LinkTarget_use_external,$(1),jpeg) $(call gb_LinkTarget_use_external_project,$(1),poppler,full) $(call gb_LinkTarget_set_include,$(1),\ @@ -2787,6 +2786,8 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT) \ ) +$(call gb_LinkTarget_use_external,$(1),jpeg) + ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ -lobjc \ |