Skip to contentSkip to conversation

package/gawk: handle optional dependencies on mpfr and readline (branch yem/host-gawk)

PATCH Superseded Yann E. MORIN 2 participants 7 messages Dec 3, 2015 – Dec 5, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover package/gawk: handle optional dependencies on mpfr and readline (branch yem/host-gawk)

Hello All!

This series adds better handling of the dependency on MPFR, and handles the optional dependency on readline.

Regards,
Yann E. MORIN.

The following changes since commit ab2e5dddfc9ea4a8214f8d968b9aab9617e01998:

wireshark: add optional geoip support (2015-12-03 22:38:31 +0100)

are available in the git repository at:

git://git.busybox.net/~ymorin/git/buildroot yem/host-gawk

for you to fetch changes up to f37416a8d0f491f30efbc89ddd3a2ce82e56b65c:

package/gawk: add optional readline dependency (2015-12-03 23:20:01 +0100)

----------------------------------------------------------------
Yann E. MORIN (2):
package/gawk: clean the mpfr dependency package/gawk: add optional readline dependency

 package/gawk/gawk.mk | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/2 package/gawk: clean the mpfr dependency

When available, mpfr provides support for BIGNUM, which allows gawk to work on arbitrarily-large numbers (hence the name).

Forcibly disable mpfr if the mpfr package is not enabled. Let ./configure find it automatically when it is enabled.

To be noted, the host-gawk needs not have BIGNUM to build the target variant with support for BIGNUM.

---
 package/gawk/gawk.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/gawk/gawk.mk +8 -1
index 6702c48..74c1fe4 100644
@@ -7,7 +7,7 @@
 GAWK_VERSION = 4.1.3
 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
-GAWK_DEPENDENCIES = host-gawk $(if $(BR2_PACKAGE_MPFR),mpfr)
+GAWK_DEPENDENCIES = host-gawk
 GAWK_LICENSE = GPLv3+
 GAWK_LICENSE_FILES = COPYING
 
@@ -16,6 +16,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 GAWK_DEPENDENCIES += busybox
 endif
 
+# When enabled, let ./configure find it automatically
+ifeq ($(BR2_PACKAGE_MPFR),y)
+GAWK_DEPENDENCIES += mpfr
+else
+GAWK_CONF_OPTS += --without-mpfr
+endif
+
 # We don't have a host-busybox, and we don't want to use readline or mpfr
 HOST_GAWK_DEPENDENCIES =
 
Signature · 1 line
1.9.1
#2 lore raw

PATCH 1/2 package/gawk: clean the mpfr dependency

Quoted 7 lines · Yann E. MORIN

When available, mpfr provides support for BIGNUM, which allows gawk to work on arbitrarily-large numbers (hence the name).

Forcibly disable mpfr if the mpfr package is not enabled. Let ./configure find it automatically when it is enabled.

To be noted, the host-gawk needs not have BIGNUM to build the target

                             ^^^^^^^^^ doesn't need to have
Quoted 4 lines

variant with support for BIGNUM.

Just minor comments.

Quoted 18 lines
---
 package/gawk/gawk.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/gawk/gawk.mk +1 -1
index 6702c48..74c1fe4 100644
@@ -7,7 +7,7 @@
 GAWK_VERSION = 4.1.3
 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
-GAWK_DEPENDENCIES = host-gawk $(if $(BR2_PACKAGE_MPFR),mpfr)
+GAWK_DEPENDENCIES = host-gawk
 GAWK_LICENSE = GPLv3+
 GAWK_LICENSE_FILES = COPYING
 

package/gawk/gawk.mk ifeq ($(BR2_PACKAGE_BUSYBOX),y) · line 19

Quoted 4 lines
package/gawk/gawk.mk +1 -0
@@ -16,6 +16,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 GAWK_DEPENDENCIES += busybox
 endif
 
+# When enabled, let ./configure find it automatically

I think a more appropriate comment would be

# --with-mpfr requires an argument so just let configure

# find it automatically.

Regards,
Arnout

Quoted 10 lines
package/gawk/gawk.mk +6 -0
+ifeq ($(BR2_PACKAGE_MPFR),y)
+GAWK_DEPENDENCIES += mpfr
+else
+GAWK_CONF_OPTS += --without-mpfr
+endif
+
 # We don't have a host-busybox, and we don't want to use readline or mpfr
 HOST_GAWK_DEPENDENCIES =
 
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#3 lore raw

PATCH 1/2 package/gawk: clean the mpfr dependency

Arnout, All,

On 2015-12-04 00:35 +0100, Arnout Vandecappelle spake thusly:

Quoted 9 lines · Yann E. MORIN
Quoted 7 lines

When available, mpfr provides support for BIGNUM, which allows gawk to work on arbitrarily-large numbers (hence the name).

Forcibly disable mpfr if the mpfr package is not enabled. Let ./configure find it automatically when it is enabled.

To be noted, the host-gawk needs not have BIGNUM to build the target

                             ^^^^^^^^^ doesn't need to have

No, sorry, this was correct english grammar:
https://dictionary.cambridge.org/grammar/british-grammar/need

We form the negative by adding not after need. Need not can be contracted to needn?t. We don?t use don?t/doesn?t/didn?t with the semi-modal verb need:

You need not spend a lot of money on presents. (formal) (or You needn?t spend a lot of money on presents.)

Not: You don?t need spend a lot of money on presents.

Or:
http://www.merriam-webster.com/dictionary/need

verbal auxiliary
: be under necessity or obligation to <you need not answer> <she need only wait>

In this case, 'need' is a verbal auxiliary, not a transitive verb (and even less so an intransitive verb).

(yes, in case you still had a doubt, I speak british English, not american English.)

Quoted 30 lines
Quoted 4 lines

variant with support for BIGNUM.

Just minor comments.

Quoted 21 lines
---
 package/gawk/gawk.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/gawk/gawk.mk +1 -1
index 6702c48..74c1fe4 100644
@@ -7,7 +7,7 @@
 GAWK_VERSION = 4.1.3
 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
-GAWK_DEPENDENCIES = host-gawk $(if $(BR2_PACKAGE_MPFR),mpfr)
+GAWK_DEPENDENCIES = host-gawk
 GAWK_LICENSE = GPLv3+
 GAWK_LICENSE_FILES = COPYING
 
@@ -16,6 +16,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 GAWK_DEPENDENCIES += busybox
 endif
 
Quoted 6 lines

package/gawk/gawk.mk ifeq ($(BR2_PACKAGE_BUSYBOX),y) · line 19

Quoted 1 line
package/gawk/gawk.mk +1 -0
+# When enabled, let ./configure find it automatically

I think a more appropriate comment would be

# --with-mpfr requires an argument so just let configure

# find it automatically.

OK, will fix.

Thanks!

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/2 package/gawk: clean the mpfr dependency

Quoted 28 lines · Yann E. MORIN

Arnout, All,

On 2015-12-04 00:35 +0100, Arnout Vandecappelle spake thusly:

Quoted 9 lines · Yann E. MORIN
Quoted 7 lines

When available, mpfr provides support for BIGNUM, which allows gawk to work on arbitrarily-large numbers (hence the name).

Forcibly disable mpfr if the mpfr package is not enabled. Let ./configure find it automatically when it is enabled.

To be noted, the host-gawk needs not have BIGNUM to build the target

                             ^^^^^^^^^ doesn't need to have

No, sorry, this was correct english grammar:
https://dictionary.cambridge.org/grammar/british-grammar/need

We form the negative by adding not after need. Need not can be contracted to needn?t. We don?t use don?t/doesn?t/didn?t with the semi-modal verb need:

You need not spend a lot of money on presents. (formal) (or You needn?t spend a lot of money on presents.)

Not: You don?t need spend a lot of money on presents.

Or:
http://www.merriam-webster.com/dictionary/need

Quoted 6 lines

verbal auxiliary
: be under necessity or obligation to <you need not answer> <she need only wait>

In this case, 'need' is a verbal auxiliary, not a transitive verb (and even less so an intransitive verb).

But then it's "need not", not "needs not". (Quotation marks really are needed
in this sentence :-)

Or, to avoid discussion:

The build of the target gawk doesn't require host-gawk with BIGNUM support.

:-P

Regards,
Arnout

Quoted 4 lines

(yes, in case you still had a doubt, I speak british English, not american English.)

[snip]

Signature · 6 lines
Arnout Vandecappelle      arnout dot vandecappelle at essensium dot com
Senior Embedded Software Architect . . . . . . +32-478-010353 (mobile)
Essensium, Mind division . . . . . . . . . . . . . . http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium . . . . . BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#5 lore raw

PATCH 2/2 package/gawk: add optional readline dependency

In reply to Yann E. MORIN

The gawk debugger can optionally use readline for user input during the debugging session (for the usual autocompletion and stuff).

Enable readline support when the readline package is enabled; let ./configure automatically find it. Forcibly disable readline support when the readline package is disabled.

---
 package/gawk/gawk.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/gawk/gawk.mk +7 -0
index 74c1fe4..4145025 100644
@@ -23,6 +23,13 @@ else
 GAWK_CONF_OPTS += --without-mpfr
 endif
 
+# When enabled, let ./configure find it automatically
+ifeq ($(BR2_PACKAGE_READLINE),y)
+GAWK_DEPENDENCIES += readline
+else
+GAWK_CONF_OPTS += --without-readline
+endif
+
 # We don't have a host-busybox, and we don't want to use readline or mpfr
 HOST_GAWK_DEPENDENCIES =
 
Signature · 1 line
1.9.1
#6 lore raw

PATCH 2/2 package/gawk: add optional readline dependency

Quoted 9 lines · Yann E. MORIN

The gawk debugger can optionally use readline for user input during the debugging session (for the usual autocompletion and stuff).

Enable readline support when the readline package is enabled; let ./configure automatically find it. Forcibly disable readline support when the readline package is disabled.

package/gawk/gawk.mk else · line 26

Quoted 13 lines
---
 package/gawk/gawk.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/gawk/gawk.mk +1 -0
index 74c1fe4..4145025 100644
@@ -23,6 +23,13 @@ else
 GAWK_CONF_OPTS += --without-mpfr
 endif
 
+# When enabled, let ./configure find it automatically

Same thing about the comment.

Regards,
Arnout

Quoted 10 lines
package/gawk/gawk.mk +6 -0
+ifeq ($(BR2_PACKAGE_READLINE),y)
+GAWK_DEPENDENCIES += readline
+else
+GAWK_CONF_OPTS += --without-readline
+endif
+
 # We don't have a host-busybox, and we don't want to use readline or mpfr
 HOST_GAWK_DEPENDENCIES =
 
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF