Skip to contentSkip to conversation

package/oniguruma: new package

PATCH New Fabrice Fontaine 2 participants 3 messages Mar 31, 2019 – Apr 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 package/oniguruma: new package

Oniguruma is a modern and flexible regular expressions library. It encompasses features from different regular expression implementations that traditionally exist in different languages.

https://github.com/kkos/oniguruma

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Remove host variant

 DEVELOPERS                                         |  1 +
 package/Config.in                                  |  1 +
 package/oniguruma/0001-fix-cross-compilation.patch | 61 ++++++++++++++++++++++
 package/oniguruma/Config.in                        |  9 ++++
 package/oniguruma/oniguruma.hash                   |  3 ++
 package/oniguruma/oniguruma.mk                     | 15 ++++++
 6 files changed, 90 insertions(+)
 create mode 100644 package/oniguruma/0001-fix-cross-compilation.patch
 create mode 100644 package/oniguruma/Config.in
 create mode 100644 package/oniguruma/oniguruma.hash
 create mode 100644 package/oniguruma/oniguruma.mk
DEVELOPERS +1 -0
index cea8755104..8230ad6bb7 100644
@@ -826,6 +826,7 @@ F:	package/mongodb/
 F:	package/motion/
 F:	package/mutt/
 F:	package/ncmpc/
+F:	package/oniguruma/
 F:	package/oprofile/
 F:	package/pcmanfm/
 F:	package/python-backcall/
package/Config.in +1 -0
index 88bf65b9f2..e617120397 100644
@@ -1771,6 +1771,7 @@ menu "Text and terminal handling"
 	source "package/linenoise/Config.in"
 	source "package/ncurses/Config.in"
 	source "package/newt/Config.in"
+	source "package/oniguruma/Config.in"
 	source "package/pcre/Config.in"
 	source "package/pcre2/Config.in"
 	source "package/popt/Config.in"
package/oniguruma/0001-fix-cross-compilation.patch new file +61 -0

61 lines not on this page · raw message

package/oniguruma/Config.in new file +9 -0
new file mode 100644
index 0000000000..2e8b41c1d6
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_ONIGURUMA
+	bool "oniguruma"
+	help
+	  Oniguruma is a modern and flexible regular expressions
+	  library. It encompasses features from different regular
+	  expression implementations that traditionally exist in
+	  different languages.
+
+	  https://github.com/kkos/oniguruma
package/oniguruma/oniguruma.hash new file +3 -0
new file mode 100644
index 0000000000..4d3392c972
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  733a91e257c20cb17b81596db48fd0fbd2e0074fe922ae4c2bc4fefcec110aae  oniguruma-6.9.1.tar.gz
+sha256  84e55812150474adf4170d4656744dfcc5f260ff7602e447a70bf13c56203e4b  COPYING
package/oniguruma/oniguruma.mk new file +15 -0
new file mode 100644
index 0000000000..1f992c2b94
@@ -0,0 +1,15 @@
+################################################################################
+#
+# oniguruma
+#
+################################################################################
+
+ONIGURUMA_VERSION = 6.9.1
+ONIGURUMA_SITE = $(call github,kkos,oniguruma,v$(ONIGURUMA_VERSION))
+ONIGURUMA_LICENSE = BSD-2-Clause
+ONIGURUMA_LICENSE_FILES = COPYING
+# From git
+ONIGURUMA_AUTORECONF = YES
+ONIGURUMA_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
Signature · 1 line
2.14.1
#1 lore raw

PATCH v2 2/2 package/jq: add oniguruma optional dependency

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Don't enable oniguruma on host-jq

 package/jq/jq.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/jq/jq.mk +8 -1
index aebe8c86e4..bf96f0cecb 100644
@@ -17,8 +17,15 @@ JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE"
 HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99 -D_GNU_SOURCE"
 
 # jq explicitly enables maintainer mode, which we don't need/want
-JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
+JQ_CONF_OPTS += --disable-maintainer-mode
 HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
 
+ifeq ($(BR2_PACKAGE_ONIGURUMA),y)
+JQ_DEPENDENCIES += oniguruma
+JQ_CONF_OPTS += --with-oniguruma
+else
+JQ_CONF_OPTS += --without-oniguruma
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.14.1
#2 lore raw

PATCH v2 1/2 package/oniguruma: new package

In reply to Fabrice Fontaine
Quoted 11 lines · On Sun, 31 Mar 2019 17:12:05 +0200 Fabrice Fontaine…

Oniguruma is a modern and flexible regular expressions library. It encompasses features from different regular expression implementations that traditionally exist in different languages.

https://github.com/kkos/oniguruma

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Remove host variant

Both patches applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com