| Message ID | 20191108091700.7438-1-p.debruijn@unilogic.nl |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] php: libsodium support | expand |
On Fri, 8 Nov 2019 10:17:00 +0100 Pascal de Bruijn <p.debruijn@unilogic.nl> wrote: > Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl> > --- > package/php/Config.ext | 6 ++++++ > package/php/php.mk | 5 +++++ > 2 files changed, 11 insertions(+) Applied to next, thanks. Thomas
diff --git a/package/php/Config.ext b/package/php/Config.ext index c7f0332fd8..0c6ed4b401 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -70,6 +70,12 @@ config BR2_PACKAGE_PHP_EXT_HASH help HASH message digest framework +config BR2_PACKAGE_PHP_EXT_LIBSODIUM + bool "libsodium" + select BR2_PACKAGE_LIBSODIUM + help + libsodium support + config BR2_PACKAGE_PHP_EXT_MCRYPT bool "mcrypt" select BR2_PACKAGE_LIBMCRYPT diff --git a/package/php/php.mk b/package/php/php.mk index b679531238..85bf2075ae 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -122,6 +122,11 @@ PHP_CONF_OPTS += \ $(if $(BR2_PACKAGE_PHP_EXT_MBSTRING),--enable-mbstring) \ $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar) +ifeq ($(BR2_PACKAGE_PHP_EXT_LIBSODIUM),y) +PHP_CONF_OPTS += --with-sodium=$(STAGING_DIR)/usr +PHP_DEPENDENCIES += libsodium +endif + ifeq ($(BR2_PACKAGE_PHP_EXT_MCRYPT),y) PHP_CONF_OPTS += --with-mcrypt=$(STAGING_DIR)/usr PHP_DEPENDENCIES += libmcrypt
Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl> --- package/php/Config.ext | 6 ++++++ package/php/php.mk | 5 +++++ 2 files changed, 11 insertions(+)