| Message ID | 20210215172848.1084947-2-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] Revert "package/lcms2: fix static building with tiff" | expand |
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > tiff is only used by tificc sample and upstream rejected the patch to > fix the static build failure because "adding pkg-config dependency for a > sample is an overkill": https://github.com/mm2/Little-CMS/pull/244 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2020.11.x, thanks.
diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 862fdd5896..44b9965a80 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -11,6 +11,8 @@ LCMS2_LICENSE_FILES = COPYING LCMS2_CPE_ID_VENDOR = littlecms LCMS2_CPE_ID_PRODUCT = little_cms LCMS2_INSTALL_STAGING = YES +# tiff is only used by tificc sample +LCMS2_CONF_OPTS = --without-tiff ifeq ($(BR2_PACKAGE_JPEG),y) LCMS2_CONF_OPTS += --with-jpeg @@ -19,13 +21,6 @@ else LCMS2_CONF_OPTS += --without-jpeg endif -ifeq ($(BR2_PACKAGE_TIFF),y) -LCMS2_CONF_OPTS += --with-tiff -LCMS2_DEPENDENCIES += tiff -else -LCMS2_CONF_OPTS += --without-tiff -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) LCMS2_CONF_OPTS += --with-zlib LCMS2_DEPENDENCIES += zlib
tiff is only used by tificc sample and upstream rejected the patch to fix the static build failure because "adding pkg-config dependency for a sample is an overkill": https://github.com/mm2/Little-CMS/pull/244 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/lcms2/lcms2.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)