package/znc: bump version to 1.7.5
PATCH 1/2 package/znc: bump version to 1.7.5
--- package/znc/znc.hash | 2 +- package/znc/znc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/znc/znc.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 b1a32921a8e6d79ee6c5900c8d07293026966db7c05aaac48984231befc49b71 znc-1.7.4.tar.gz +sha256 a8941e1385c8654287a4428018d93459482e9d5eeedf86bef7b020ddc5f24721 znc-1.7.5.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
package/znc/znc.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ZNC_VERSION = 1.7.4 +ZNC_VERSION = 1.7.5 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE
Signature · 1 line
2.20.1
PATCH 2/2 package/znc: switch to cmake
Upstream deprecated autoconf and asks to use cmake:
https://github.com/znc/znc/commit/71f35b003dda65f3867ff84deaf8aa15bcd0b958
Add options to explicitly disable cyrus and i18n support.
--- package/znc/znc.mk | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
package/znc/znc.mk +12 -10
@@ -9,35 +9,37 @@ ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE ZNC_DEPENDENCIES = host-pkgconf -ZNC_CONF_OPTS = --disable-perl +ZNC_CONF_OPTS = -DWANT_CYRUS=OFF -DWANT_I18N=OFF -DWANT_PERL=OFF ifeq ($(BR2_PACKAGE_ICU),y) ZNC_DEPENDENCIES += icu -ZNC_CONF_OPTS += --enable-charset +ZNC_CONF_OPTS += -DWANT_ICU=ON else -ZNC_CONF_OPTS += --disable-charset +ZNC_CONF_OPTS += -DWANT_ICU=OFF endif ifeq ($(BR2_PACKAGE_OPENSSL),y) ZNC_DEPENDENCIES += openssl -ZNC_CONF_OPTS += --enable-openssl +ZNC_CONF_OPTS += -DWANT_OPENSSL=ON else -ZNC_CONF_OPTS += --disable-openssl +ZNC_CONF_OPTS += -DWANT_OPENSSL=OFF endif ifeq ($(BR2_PACKAGE_ZLIB),y) ZNC_DEPENDENCIES += zlib -ZNC_CONF_OPTS += --enable-zlib +ZNC_CONF_OPTS += -DWANT_ZLIB=ON else -ZNC_CONF_OPTS += --disable-zlib +ZNC_CONF_OPTS += -DWANT_ZLIB=OFF endif # python support depends on icu ifeq ($(BR2_PACKAGE_ICU)$(BR2_PACKAGE_PYTHON3),yy) ZNC_DEPENDENCIES += python3 host-swig -ZNC_CONF_OPTS += --enable-python=python3 +ZNC_CONF_OPTS += \ + -DWANT_PYTHON=ON \ + -DWANT_PYTHON_VERSION=python3 else -ZNC_CONF_OPTS += --disable-python +ZNC_CONF_OPTS += -DWANT_PYTHON=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package))
Signature · 1 line
2.20.1
PATCH 2/2 package/znc: switch to cmake
Quoted 9 lines · On Sat, 28 Sep 2019 12:41:06 +0200 Bernd Kuhls <[email protected]> wrote:
Upstream deprecated autoconf and asks to use cmake:
https://github.com/znc/znc/commit/71f35b003dda65f3867ff84deaf8aa15bcd0b958Add options to explicitly disable cyrus and i18n support.
Signed-off-by Bernd Kuhls <[email protected]>--- package/znc/znc.mk | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
Applied to master, thanks. Regarding the WANT_I18N option, what does it do exactly ? Indeed, the autotools package infrastructure was automatically passing --enable-nls or --disable-nls depending on the value of BR2_SYSTEM_ENABLE_NLS. So with your unconditional addition of WANT_I18N=OFF, I'm wondering if we have lost NLS support in znc when BR2_SYSTEM_ENABLE_NLS=y. Could you check this ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 package/znc: switch to cmake
Am Sat, 28 Sep 2019 21:50:35 +0200 schrieb Thomas Petazzoni:
Quoted 6 lines
Applied to master, thanks. Regarding the
WANT_I18Noption, what does it do exactly ? Indeed, the autotools package infrastructure was automatically passing --enable-nls or --disable-nls depending on the value ofBR2_SYSTEM_ENABLE_NLS. So with your unconditional addition of WANT_I18N=OFF, I'm wondering if we have lost NLS support in znc when BR2_SYSTEM_ENABLE_NLS=y. Could you check this ?
Hi Thomas,
WANT_I18N enables the C/C++ define HAVE_I18N, but only if Boost.Locale and gettext were found:
https://github.com/znc/znc/blob/master/CMakeLists.txt#L222
HAVE_I18N was not used by autoconf so we did not lose any features when switching to cmake.
Regards, Bernd
Thomas Petazzoni
AppliedPATCH 1/2 package/znc: bump version to 1.7.5
In reply to Bernd KuhlsQuoted 5 lines · On Sat, 28 Sep 2019 12:41:05 +0200 Bernd Kuhls <[email protected]> wrote:
Signed-off-by Bernd Kuhls <[email protected]>--- package/znc/znc.hash | 2 +- package/znc/znc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 package/znc: switch to cmake
Quoted 6 lines · On Sat, 28 Sep 2019 22:00:43 +0200 Bernd Kuhls <[email protected]> wrote:
WANT_I18Nenables the C/C++ defineHAVE_I18N, but only if Boost.Locale and gettext were found:
https://github.com/znc/znc/blob/master/CMakeLists.txt#L222
HAVE_I18Nwas not used by autoconf so we did not lose any features when switching to cmake.
OK, thanks for the confirmation!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com