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

Hello All!

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

Changes v1 -> v2:
- better comment on why no --with-{mpfr,readline} (Arnout)

Regards,
Yann E. MORIN.

The following changes since commit f8daafddb2339d5d34af1ed23f7dcf4380b775bc:

docs: website: update for 2015.11.1 (2015-12-05 23:17:04 +0100)

are available in the git repository at:

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

for you to fetch changes up to 2b971b558fa20e875348aa2213e0ad385f72d20f:

package/gawk: add optional readline dependency (2015-12-06 09:42:01 +0100)

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

 package/gawk/gawk.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

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 need not have BIGNUM to build the target variant with support for BIGNUM.

---
Changes v1 -> v2:
- better comment on why no --with-mpfr (Arnout)

---
 package/gawk/gawk.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

index 6702c48..0fd131d 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,14 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 GAWK_DEPENDENCIES += busybox
 endif
 
+# --with-mpfr requires an argument so just 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 =
 

1.9.1

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.

---
Changes v1 -> v2:
- better comment on why no --with-readline (Arnout)

---
 package/gawk/gawk.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

index 0fd131d..507ea6d 100644
@@ -24,6 +24,14 @@ else
 GAWK_CONF_OPTS += --without-mpfr
 endif
 
+# --with-readline requires an argument so just 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 =
 

1.9.1

Dear Yann E. MORIN,

Applied, thanks!

Thomas

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