From a4f9b2d9860531caa385440a9896d6c112e7a5e2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Thu, 29 Nov 2018 17:42:02 -0300
Subject: [PATCH] recipes: devel/make: include GUILE support

---
 .../make/fbf71ec25a5986d9003ac16ee9e23675feac9053  | 55 ++++++++++++++++++++++
 recipes/devel/make/recipe                          | 19 +++++---
 2 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 patches/make/fbf71ec25a5986d9003ac16ee9e23675feac9053

diff --git a/patches/make/fbf71ec25a5986d9003ac16ee9e23675feac9053 b/patches/make/fbf71ec25a5986d9003ac16ee9e23675feac9053
new file mode 100644
index 00000000..374536ab
--- /dev/null
+++ b/patches/make/fbf71ec25a5986d9003ac16ee9e23675feac9053
@@ -0,0 +1,55 @@
+From fbf71ec25a5986d9003ac16ee9e23675feac9053 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sun, 16 Apr 2017 15:03:48 -0400
+Subject: * configure.ac: [SV 50648] Detect Guile 2.2 packages.
+
+---
+ configure.ac | 26 ++++++++++++++++----------
+ 1 file changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1187ad4..a78fb93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,22 +160,28 @@ AC_FUNC_ALLOCA
+ AC_FUNC_CLOSEDIR_VOID
+ 
+ # See if the user wants to add (or not) GNU Guile support
+-PKG_PROG_PKG_CONFIG
+ AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile],
+             [Support GNU Guile for embedded scripting])])
+ 
+-# For some strange reason, at least on Ubuntu, each version of Guile
+-# comes with it's own PC file so we have to specify them as individual
+-# packages.  Ugh.
++# Annoyingly, each version of Guile comes with it's own PC file so we have to
++# specify them as individual packages.  Ugh.
++PKG_PROG_PKG_CONFIG
++
+ AS_IF([test "x$with_guile" != xno],
+-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
+-  [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes],
+-    [have_guile=no])])
++[ guile_versions="2.2 2.0 1.8"
++  guile_version=no
++  have_guile=no
++  AC_MSG_CHECKING([for GNU Guile])
++  for v in $guile_versions; do
++    PKG_CHECK_EXISTS([guile-$v], [guile_version=$v; have_guile=yes; break], [])
++  done
++  AC_MSG_RESULT([$guile_version])
++  if test "$have_guile" = yes; then
++    PKG_CHECK_MODULES(GUILE, [guile-$guile_version])
++    AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])
++  fi
+ ])
+ 
+-AS_IF([test "$have_guile" = yes],
+-      [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])])
+-
+ AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes])
+ 
+ AC_FUNC_GETLOADAVG
+-- 
+cgit v1.0-41-gc330
+
diff --git a/recipes/devel/make/recipe b/recipes/devel/make/recipe
index e5a462a6..c33bbc39 100644
--- a/recipes/devel/make/recipe
+++ b/recipes/devel/make/recipe
@@ -1,6 +1,6 @@
 # Build recipe for make.
 #
-# Copyright (c) 2016-2017 Matias Fonzo, <selk@dragora.org>.
+# Copyright (c) 2016-2018 Matias Fonzo, <selk@dragora.org>.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 program=make
 version=4.2.1
-release=1
+release=2
 
 # Set 'outdir' for a nice and well-organized output directory
 outdir="${outdir}/${arch}/devel"
@@ -57,17 +57,24 @@ build()
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
-    # Configure without GUILE support for embedded scripting for now.
-    ./configure CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS -static" \
+    # Apply patches from upstream.
+    #
+    # Detect Guile 2.2
+    # http://git.savannah.nongnu.org/cgit/make.git/commit/?id=fbf71ec25a5986d9003ac16ee9e23675feac9053
+    patch -p1 < "${worktree}/patches/make/fbf71ec25a5986d9003ac16ee9e23675feac9053"
+
+    autoreconf -vif
+
+    ./configure CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \
      $configure_args \
      --libdir=/usr/lib${libSuffix} \
      --infodir=$infodir \
      --mandir=$mandir \
-     --without-guile \
+     --with-guile \
      --build="$(cc -dumpmachine)"
 
     make -j${jobs} V=1
-    make -j${jobs} DESTDIR="$destdir" install
+    make -j${jobs} DESTDIR="$destdir" install-strip
 
     # Make symlink for "GNU make"
     ( cd "${destdir}/usr/bin" && ln -sf make gmake )
-- 
2.11.4.GIT