Skip to contentSkip to conversation

package/oniguruma: new package

PATCH Superseded Fabrice Fontaine 2 participants 6 messages Mar 20, 2019 – Mar 31, 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

---
 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                     | 16 ++++++
 6 files changed, 91 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 f005a2ff11..bcbf0e08d6 100644
@@ -817,6 +817,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 7f62d3da64..4dd561e396 100644
@@ -1763,6 +1763,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 +16 -0
new file mode 100644
index 0000000000..a3339f8180
@@ -0,0 +1,16 @@
+################################################################################
+#
+# 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))
+$(eval $(host-autotools-package))
Signature · 1 line
2.14.1
#1 lore raw

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

---
Changes v1 -> v2:
- Always enable oniguruma on host-jq

 package/jq/jq.mk | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
package/jq/jq.mk +12 -2
index aebe8c86e4..d8cab80c9a 100644
@@ -17,8 +17,18 @@ 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
-HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
+JQ_CONF_OPTS += --disable-maintainer-mode
+HOST_JQ_CONF_OPTS += --disable-maintainer-mode
+
+HOST_JQ_CONF_OPTS += --with-oniguruma
+HOST_JQ_DEPENDENCIES += host-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 2/2 package/jq: add oniguruma optional dependency

Hello,

package/jq/jq.mk JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE" · line 24

Quoted 8 lines · On Wed, 20 Mar 2019 21:36:17 +0100 Fabrice Fontaine…
 # jq explicitly enables maintainer mode, which we don't need/want
package/jq/jq.mk +5 -2
-JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
-HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
+JQ_CONF_OPTS += --disable-maintainer-mode
+HOST_JQ_CONF_OPTS += --disable-maintainer-mode
+
+HOST_JQ_CONF_OPTS += --with-oniguruma
+HOST_JQ_DEPENDENCIES += host-oniguruma

What decided you to add onigurama as a mandatory dependency for host-jq ? What feature does it bring ? Do we really need it as a mandatory dependency ?

Thomas

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

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

Hello,

Le dim. 31 mars 2019 ? 15:14, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 6 lines

Hello,

On Wed, 20 Mar 2019 21:36:17 +0100
Fabrice Fontaine <[email protected]> wrote:

Quoted 12 lines

package/jq/jq.mk JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE" · line 24

Quoted 8 lines
 # jq explicitly enables maintainer mode, which we don't need/want
package/jq/jq.mk +5 -2
-JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
-HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma
+JQ_CONF_OPTS += --disable-maintainer-mode
+HOST_JQ_CONF_OPTS += --disable-maintainer-mode
+
+HOST_JQ_CONF_OPTS += --with-oniguruma
+HOST_JQ_DEPENDENCIES += host-oniguruma

What decided you to add onigurama as a mandatory dependency for host-jq ? What feature does it bring ? Do we really need it as a mandatory dependency ?

I decided to keep it because it's enabled by default in upstream but I can send a v2 without it as no package depends on this feature.

Quoted 6 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice

#4 lore raw

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

Quoted 5 lines · On Sun, 31 Mar 2019 15:27:38 +0200 Fabrice Fontaine…
Quoted 3 lines

What decided you to add onigurama as a mandatory dependency for host-jq ? What feature does it bring ? Do we really need it as a mandatory dependency ?

I decided to keep it because it's enabled by default in upstream but I can send a v2 without it as no package depends on this feature.

We normally try to keep the dependencies as minimal as possible, so until we have a use-case for this, I'd prefer to not have this dependency for the host variant.

This means the onigurama package should only add a target variant.

Thanks!

Thomas

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

PATCH v2 1/2 package/oniguruma: new package

In reply to Fabrice Fontaine

Hello,

package/oniguruma/0001-fix-cross-compilation.patch line 10

Quoted 3 lines · On Wed, 20 Mar 2019 21:36:16 +0100 Fabrice Fontaine…
package/oniguruma/0001-fix-cross-compilation.patch new file +3 -0
+libtool: compile: /home/fabrice/buildroot/output/host/bin/m68k-linux-gcc -DHAVE_CONFIG_H -I. -I.. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+-D_FILE_OFFSET_BITS=64 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -fno-dwarf2-cfi-asm -Wl,-elf2flt -c regparse.c -o regparse.o
+m68k-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include'

Just a quick comment: reporting this particular error message to upstream projects doesn't make sense, because it's a special error message added by the Buildroot toolchain wrapper, i.e it's Buildroot specific.

When reporting this sort of issues upstream, you should simply say something like "Adding -I/usr/include when cross-compiling is incorrect, as /usr/include contains headers for the build system, not the target system" or something like that.

The rest of the patch looks good to me, but I have some questions on the second patch.

Thomas

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