diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-02 14:13:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-11-02 20:04:23 +0000 |
| commit | eea709f67d91e271e3df37e6c6724b7b5870b1ee (patch) | |
| tree | 170d8daf2c45e04f461556ede40699d3d6a4fc2c /RepositoryExternal.mk | |
| parent | 092261ffd497f752c342f1fbdca6e7267e312a21 (diff) | |
poppler: build against libjpeg
Albert Astals Cid points out that --disable-libjpeg causes poppler to
use internal JPEG code instead, which is not actively maintained.
Add LIBJPEG_CFLAGS / LIBJPEG_LIBS to config_host.mk and patch poppler to
respect LIBJPEG_LIBS.
Change-Id: Id19a62a9bd9dc41fee5e8e43e2798e515aacc299
Reviewed-on: https://gerrit.libreoffice.org/30496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 93a5459ed6dc..1f891d527058 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -425,32 +425,37 @@ endif # SYSTEM_ZLIB ifneq ($(SYSTEM_JPEG),) define gb_LinkTarget__use_jpeg -$(call gb_LinkTarget_add_libs,$(1),-ljpeg) +$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) $(call gb_LinkTarget_set_ldflags,$(1),\ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \ ) endef +gb_ExternalProject__use_jpeg := + else ifneq ($(filter JPEG_TURBO,$(BUILD_TYPE)),) define gb_LinkTarget__use_jpeg $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,jpeg-turbo) \ + $(LIBJPEG_CFLAGS) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,jpeg-turbo)/.libs/libjpeg$(gb_StaticLibrary_PLAINEXT) \ -) +$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) $(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo,full) endef +define gb_ExternalProject__use_jpeg +$(call gb_ExternalProject_use_external_project,$(1),jpeg-turbo) + +endef + else # !SYSTEM_JPEG define gb_LinkTarget__use_jpeg $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,jpeg) \ + $(LIBJPEG_CFLAGS) \ $$(INCLUDE) \ ) @@ -458,6 +463,11 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ jpeg \ ) +define gb_ExternalProject__use_jpeg +$(call gb_ExternalProject_use_static_libraries,$(1),jpeg) + +endef + endef endif # SYSTEM_JPEG @@ -2752,6 +2762,7 @@ 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),\ |