| Message ID | 1454170636-9427-5-git-send-email-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Commit | 40353e3e13e9b1c7ad95237fbc745f914bfa50ad |
| Headers | show |
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes: > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/libraw/libraw.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk > index 5ebc4a2..e261e2b 100644 > --- a/package/libraw/libraw.mk > +++ b/package/libraw/libraw.mk > @@ -12,7 +12,6 @@ LIBRAW_INSTALL_STAGING = YES > LIBRAW_AUTORECONF = YES > LIBRAW_CONF_OPTS += \ > --disable-examples \ > - --disable-lcms \ > --disable-openmp \ > --disable-demosaic-pack-gpl2 \ > --disable-demosaic-pack-gpl3 > @@ -33,4 +32,11 @@ else > LIBRAW_CONF_OPTS += --disable-jpeg > endif > +ifeq ($(BR2_PACKAGE_LCMS2),y) > +LIBRAW_CONF_OPTS += --enable-lcms > +LIBRAW_DEPENDENCIES += lcms2 The configure script uses pkg-config to figure out the lcms CFLAGS/LIBS, so we should also depend on host-pkgconf. Committed series with this fixed, thanks.
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index 5ebc4a2..e261e2b 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -12,7 +12,6 @@ LIBRAW_INSTALL_STAGING = YES LIBRAW_AUTORECONF = YES LIBRAW_CONF_OPTS += \ --disable-examples \ - --disable-lcms \ --disable-openmp \ --disable-demosaic-pack-gpl2 \ --disable-demosaic-pack-gpl3 @@ -33,4 +32,11 @@ else LIBRAW_CONF_OPTS += --disable-jpeg endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +LIBRAW_CONF_OPTS += --enable-lcms +LIBRAW_DEPENDENCIES += lcms2 +else +LIBRAW_CONF_OPTS += --disable-lcms +endif + $(eval $(autotools-package))
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/libraw/libraw.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)