Message ID | 1456051888-2047-2-git-send-email-bernd.kuhls@t-online.de |
---|---|
State | Accepted |
Headers | show |
Dear Bernd Kuhls, On Sun, 21 Feb 2016 11:51:23 +0100, Bernd Kuhls wrote: > When lcms2 was compiled before, imagemagick will use it as optional > dependency: > > $ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/identify | grep NEEDED > 0x0000000000000001 (NEEDED) Shared library: [libMagickCore-6.Q16.so.2] > 0x0000000000000001 (NEEDED) Shared library: [libMagickWand-6.Q16.so.2] > 0x0000000000000001 (NEEDED) Shared library: [liblcms2.so.2] > [...] > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/imagemagick/imagemagick.mk | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master, thanks. Thomas
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index eee567e..8fc9532 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -60,6 +60,13 @@ else IMAGEMAGICK_CONF_OPTS += --without-jpeg endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +IMAGEMAGICK_CONF_OPTS += --with-lcms +IMAGEMAGICK_DEPENDENCIES += lcms2 +else +IMAGEMAGICK_CONF_OPTS += --without-lcms +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) IMAGEMAGICK_CONF_OPTS += --with-png IMAGEMAGICK_DEPENDENCIES += libpng
When lcms2 was compiled before, imagemagick will use it as optional dependency: $ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/identify | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libMagickCore-6.Q16.so.2] 0x0000000000000001 (NEEDED) Shared library: [libMagickWand-6.Q16.so.2] 0x0000000000000001 (NEEDED) Shared library: [liblcms2.so.2] [...] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/imagemagick/imagemagick.mk | 7 +++++++ 1 file changed, 7 insertions(+)