Skip to contentSkip to conversation

pcre: add UTF support option

PATCH Superseded yegorslists at googlemail.com 2 participants 6 messages Oct 25, 2013 – Oct 27, 2013

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 pcre: add UTF support option

From: Yegor Yefremov <[email protected]>

Add BR2_PACKAGE_PCRE_UTF option, that activates
--enable-unicode-properties for UTF-8/16/32.

---
 package/pcre/Config.in |    5 +++++
 package/pcre/pcre.mk   |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)
package/pcre/Config.in +5 -0
index dc92274..3ca27c0 100644
@@ -19,4 +19,9 @@ config BR2_PACKAGE_PCRE_32
 	help
 	  This option builds the 32-bits pcre library, i.e 'libpcre32'
 
+config BR2_PACKAGE_PCRE_UTF
+	bool "UTF support"
+	help
+	  This option enables UTF support
+
 endif
package/pcre/pcre.mk +1 -0
index bf86a3d..0d1d66b 100644
@@ -19,5 +19,6 @@ endif
 PCRE_CONF_OPT += --enable-pcre8
 PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16)
 PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32)
+PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_UTF),--enable-unicode-properties,--disable-unicode-properties)
 
 $(eval $(autotools-package))
Signature · 1 line
1.7.7
#1 lore raw

PATCH v2 2/2 ModemManager: add new package

From: Yegor Yefremov <[email protected]>

---
Changes:
v2: typos, add select QMI to the config option, don't install to staging

 package/Config.in                      |    1 +
 package/modem-manager/Config.in        |   33 ++++++++++++++++++++++++++++++++
 package/modem-manager/modem-manager.mk |   21 ++++++++++++++++++++
 3 files changed, 55 insertions(+), 0 deletions(-)
 create mode 100644 package/modem-manager/Config.in
 create mode 100644 package/modem-manager/modem-manager.mk
package/Config.in +1 -0
index 0e6f86c..34c0e7b 100644
@@ -820,6 +820,7 @@ source "package/lrzsz/Config.in"
 source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
 source "package/minidlna/Config.in"
+source "package/modem-manager/Config.in"
 source "package/mongoose/Config.in"
 source "package/mongrel2/Config.in"
 source "package/mrouted/Config.in"
package/modem-manager/Config.in new file +33 -0
new file mode 100644
index 0000000..202d846
@@ -0,0 +1,33 @@
+config BR2_PACKAGE_MODEM_MANAGER
+	bool "ModemManager"
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	select BR2_PACKAGE_DBUS
+	depends on BR2_INET_IPV6
+	depends on BR2_LARGEFILE # acl
+	depends on BR2_USE_WCHAR # libglib2 and gnutls
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
+	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_UDEV
+	select BR2_PACKAGE_UDEV_ALL_EXTRAS
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE_UTF
+	help
+	  ModemManager is a DBus-activated daemon which controls mobile
+	  broadband (2G/3G/4G) devices and connections.
+
+	  http://www.freedesktop.org/wiki/Software/ModemManager/
+
+if BR2_PACKAGE_MODEM_MANAGER
+
+config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
+	bool "QMI support"
+	select BR2_PACKAGE_LIBQMI
+	help
+	  This option enables support for QMI protocol
+endif
+
+comment "ModemkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
+
package/modem-manager/modem-manager.mk new file +21 -0
new file mode 100644
index 0000000..ebf2617
@@ -0,0 +1,21 @@
+################################################################################
+#
+# modem-manager
+#
+################################################################################
+
+MODEM_MANAGER_VERSION = 1.0.0
+MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
+MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager/
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
+
+MODEM_MANAGER_CONF_OPT = \
+		--without-mbim
+
+ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
+	MODEM_MANAGER_DEPENDENCIES += libqmi
+else
+	MODEM_MANAGER_CONF_OPT += --without-qmi
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.7
#2 lore raw

PATCH v2 2/2 ModemManager: add new package

Quoted 71 lines · On Fri, Oct 25, 2013 at 12:28 PM, <[email protected]> wrote:

From: Yegor Yefremov <[email protected]>

---
Changes:
v2: typos, add select QMI to the config option, don't install to staging

 package/Config.in                      |    1 +
 package/modem-manager/Config.in        |   33 ++++++++++++++++++++++++++++++++
 package/modem-manager/modem-manager.mk |   21 ++++++++++++++++++++
 3 files changed, 55 insertions(+), 0 deletions(-)
 create mode 100644 package/modem-manager/Config.in
 create mode 100644 package/modem-manager/modem-manager.mk
package/Config.in +1 -0
index 0e6f86c..34c0e7b 100644
@@ -820,6 +820,7 @@ source "package/lrzsz/Config.in"
 source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
 source "package/minidlna/Config.in"
+source "package/modem-manager/Config.in"
 source "package/mongoose/Config.in"
 source "package/mongrel2/Config.in"
 source "package/mrouted/Config.in"
package/modem-manager/Config.in new file +33 -0
new file mode 100644
index 0000000..202d846
@@ -0,0 +1,33 @@
+config BR2_PACKAGE_MODEM_MANAGER
+       bool "ModemManager"
+       depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+       select BR2_PACKAGE_DBUS
+       depends on BR2_INET_IPV6
+       depends on BR2_LARGEFILE # acl
+       depends on BR2_USE_WCHAR # libglib2 and gnutls
+       depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
+       depends on BR2_USE_MMU # dbus
+       select BR2_PACKAGE_DBUS_GLIB
+       select BR2_PACKAGE_UDEV
+       select BR2_PACKAGE_UDEV_ALL_EXTRAS
+       select BR2_PACKAGE_PCRE
+       select BR2_PACKAGE_PCRE_UTF
+       help
+         ModemManager is a DBus-activated daemon which controls mobile
+         broadband (2G/3G/4G) devices and connections.
+
+         http://www.freedesktop.org/wiki/Software/ModemManager/
+
+if BR2_PACKAGE_MODEM_MANAGER
+
+config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
+       bool "QMI support"
+       select BR2_PACKAGE_LIBQMI
+       help
+         This option enables support for QMI protocol
+endif
+
+comment "ModemkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"
+       depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
+               !BR2_TOOLCHAIN_HAS_THREADS
+
package/modem-manager/modem-manager.mk new file +0 -0
new file mode 100644
index 0000000..ebf2617

package/modem-manager/modem-manager.mk line 9

Quoted 9 lines
package/modem-manager/modem-manager.mk new file +9 -0
@@ -0,0 +1,21 @@
+################################################################################
+#
+# modem-manager
+#
+################################################################################
+
+MODEM_MANAGER_VERSION = 1.0.0
+MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
+MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager/

Forgot about licencing information :-(

MODEM_MANAGER_LICENSE = GPLv2
MODEM_MANAGER_LICENSE_FILES = COPYING

Quoted 15 lines
package/modem-manager/modem-manager.mk new file +12 -1
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
+
+MODEM_MANAGER_CONF_OPT = \
+               --without-mbim
+
+ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
+       MODEM_MANAGER_DEPENDENCIES += libqmi
+else
+       MODEM_MANAGER_CONF_OPT += --without-qmi
+endif
+
+$(eval $(autotools-package))
--

1.7.7

#3 lore raw

PATCH v2 2/2 ModemManager: add new package

In reply to yegorslists at googlemail.com

Hello,

package/modem-manager/Config.in line 2

Quoted 8 lines · yegorslists at googlemail.com
package/modem-manager/Config.in new file +2 -0
new file mode 100644
index 0000000..202d846
@@ -0,0 +1,33 @@
+config BR2_PACKAGE_MODEM_MANAGER
+	bool "ModemManager"

I think we want all the package names to be lower case.

Quoted 18 lines
package/modem-manager/Config.in new file +18 -0
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	select BR2_PACKAGE_DBUS
+	depends on BR2_INET_IPV6
+	depends on BR2_LARGEFILE # acl
+	depends on BR2_USE_WCHAR # libglib2 and gnutls
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
+	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_UDEV
+	select BR2_PACKAGE_UDEV_ALL_EXTRAS
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE_UTF
+	help
+	  ModemManager is a DBus-activated daemon which controls mobile
+	  broadband (2G/3G/4G) devices and connections.
+
+	  http://www.freedesktop.org/wiki/Software/ModemManager/
+

package/modem-manager/Config.in line 30

Quoted 10 lines
package/modem-manager/Config.in new file +10 -0
+if BR2_PACKAGE_MODEM_MANAGER
+
+config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
+	bool "QMI support"
+	select BR2_PACKAGE_LIBQMI
+	help
+	  This option enables support for QMI protocol
+endif
+
+comment "ModemkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"

typo on ModemManager (which should be lower case as well here).

package/modem-manager/Config.in line 32

Quoted 2 lines
package/modem-manager/Config.in new file +2 -0
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS

Shouldn't we have a comment about the udev dependency?

package/modem-manager/Config.in

Quoted 4 lines
package/modem-manager/Config.in new file +4 -0
+MODEM_MANAGER_VERSION = 1.0.0
+MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
+MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager/
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool

You don't depend on pcre?

Also, as you mentioned in a reply, please add the licensing information. Note that it seems to be GPLv2+ and not GPLv2.

package/modem-manager/Config.in

Quoted 2 lines
package/modem-manager/Config.in new file +2 -0
+MODEM_MANAGER_CONF_OPT = \
+		--without-mbim

One too many tabs in this indentation.

package/modem-manager/Config.in

Quoted 2 lines
package/modem-manager/Config.in new file +2 -0
+ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
+	MODEM_MANAGER_DEPENDENCIES += libqmi
	MODEM_MANAGER_CONF_OPT += --with-qmi

package/modem-manager/Config.in

Quoted 3 lines
package/modem-manager/Config.in new file +3 -0
+else
+	MODEM_MANAGER_CONF_OPT += --without-qmi
+endif

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH v2 2/2 ModemManager: add new package

Quoted 13 lines · Thomas Petazzoni

Hello,

package/modem-manager/Config.in line 2

Quoted 8 lines · yegorslists at googlemail.com
package/modem-manager/Config.in new file +2 -0
new file mode 100644
index 0000000..202d846
@@ -0,0 +1,33 @@
+config BR2_PACKAGE_MODEM_MANAGER
+     bool "ModemManager"

I think we want all the package names to be lower case.

Should NetworkManager be also renamed in networkmanager?

Quoted 22 lines
Quoted 22 lines
package/modem-manager/Config.in new file +22 -0
+     depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+     select BR2_PACKAGE_DBUS
+     depends on BR2_INET_IPV6
+     depends on BR2_LARGEFILE # acl
+     depends on BR2_USE_WCHAR # libglib2 and gnutls
+     depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
+     depends on BR2_USE_MMU # dbus
+     select BR2_PACKAGE_DBUS_GLIB
+     select BR2_PACKAGE_UDEV
+     select BR2_PACKAGE_UDEV_ALL_EXTRAS
+     select BR2_PACKAGE_PCRE
+     select BR2_PACKAGE_PCRE_UTF
+     help
+       ModemManager is a DBus-activated daemon which controls mobile
+       broadband (2G/3G/4G) devices and connections.
+
+       http://www.freedesktop.org/wiki/Software/ModemManager/
+
+if BR2_PACKAGE_MODEM_MANAGER
+
+config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
+     bool "QMI support"
Quoted 8 lines

package/modem-manager/Config.in line 30

Quoted 6 lines
package/modem-manager/Config.in new file +6 -0
+     select BR2_PACKAGE_LIBQMI
+     help
+       This option enables support for QMI protocol
+endif
+
+comment "ModemkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"

typo on ModemManager (which should be lower case as well here).

ACK

Quoted 4 lines

package/modem-manager/Config.in line 32

Quoted 2 lines
package/modem-manager/Config.in new file +2 -0
+     depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
+             !BR2_TOOLCHAIN_HAS_THREADS

Shouldn't we have a comment about the udev dependency?

ACK

Quoted 6 lines

package/modem-manager/Config.in

Quoted 4 lines
package/modem-manager/Config.in new file +4 -0
+MODEM_MANAGER_VERSION = 1.0.0
+MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
+MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager/
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool

You don't depend on pcre?

ACK

Quoted 7 lines

Also, as you mentioned in a reply, please add the licensing information. Note that it seems to be GPLv2+ and not GPLv2.

package/modem-manager/Config.in

Quoted 2 lines
package/modem-manager/Config.in new file +2 -0
+MODEM_MANAGER_CONF_OPT = \
+             --without-mbim

One too many tabs in this indentation.

ACK

Quoted 4 lines

package/modem-manager/Config.in

Quoted 2 lines
package/modem-manager/Config.in new file +2 -0
+ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
+     MODEM_MANAGER_DEPENDENCIES += libqmi
        MODEM_MANAGER_CONF_OPT += --with-qmi

ACK

Quoted 3 lines

package/modem-manager/Config.in

Quoted 3 lines
package/modem-manager/Config.in new file +3 -0
+else
+     MODEM_MANAGER_CONF_OPT += --without-qmi
+endif

Thanks for review.

Yegor

#5 lore raw

PATCH v2 1/2 pcre: add UTF support option

In reply to yegorslists at googlemail.com

Hello,

package/pcre/Config.in config BR2_PACKAGE_PCRE_32 · line 25

Quoted 4 lines · yegorslists at googlemail.com
package/pcre/Config.in +4 -0
+config BR2_PACKAGE_PCRE_UTF
+	bool "UTF support"
+	help
+	  This option enables UTF support

I would maybe change this to UTF-8/16/32 support, which is what the ./configure help text says.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com