| Message ID | 20240225092425.783094-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/gdal: add openssl optional dependency | expand |
On 25/02/2024 10:24, Fabrice Fontaine wrote: > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/gdal/gdal.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk > index 247e13663c..77ffb514c2 100644 > --- a/package/gdal/gdal.mk > +++ b/package/gdal/gdal.mk > @@ -46,7 +46,6 @@ GDAL_CONF_OPTS = \ > -DGDAL_USE_BLOSC=OFF \ > -DGDAL_USE_BRUNSLI=OFF \ > -DGDAL_USE_CFITSIO=OFF \ > - -DGDAL_USE_OPENSSL=OFF \ > -DGDAL_USE_CRYPTOPP=OFF \ > -DGDAL_USE_CRNLIB=OFF \ > -DGDAL_USE_ECW=OFF \ > @@ -130,6 +129,13 @@ else > GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF > endif > > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +GDAL_DEPENDENCIES += openssl > +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=ON > +else > +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=OFF > +endif > + > ifeq ($(BR2_PACKAGE_POSTGRESQL),y) > GDAL_DEPENDENCIES += postgresql > GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON
diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 247e13663c..77ffb514c2 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -46,7 +46,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_BLOSC=OFF \ -DGDAL_USE_BRUNSLI=OFF \ -DGDAL_USE_CFITSIO=OFF \ - -DGDAL_USE_OPENSSL=OFF \ -DGDAL_USE_CRYPTOPP=OFF \ -DGDAL_USE_CRNLIB=OFF \ -DGDAL_USE_ECW=OFF \ @@ -130,6 +129,13 @@ else GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GDAL_DEPENDENCIES += openssl +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/gdal/gdal.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)