Re: [PATCH] Add to the 2.1.x branch GUILE_SITE_CCACHE_DIR and GUILE_EXTENSION_DIR Autoconf macros along with needed siteccachdir entry in pkgconfig file

[Freja Nordsiek <fnordsie@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3109 bytes --]

I missed adding an entry for meta/guile-2.2.pc.in in the commit log. Fixed now.


Freja Nordsiek

On Tue, Mar 14, 2017 at 5:10 PM, Freja Nordsiek <fnordsie@gmail.com> wrote:
> OK, got it on the commit log. Took some work to figure out how to do a
> multiline one, but got it now.
>
> Fixed the long lines.
>
> Removed the --print-errors option. Didn't catch that.
>
> Thank you for all the help. Yeah, this sort of nitpicking makes it a
> lot easier for people in the future to work on things.
>
>
> Freja Nordsiek
>
>
>
>
> On Tue, Mar 14, 2017 at 4:56 PM, Andy Wingo <wingo@pobox.com> wrote:
>> Heya :)
>>
>> On Tue 14 Mar 2017 16:31, Freja Nordsiek <fnordsie@gmail.com> writes:
>>
>>> From 41498549ac22ea50e497887b3a1e002985bb6f8f Mon Sep 17 00:00:00 2001
>>> From: Freja Nordsiek <fnordsie@gmail.com>
>>> Date: Tue, 14 Mar 2017 16:28:45 +0100
>>> Subject: [PATCH] GUILE_SITE_DIR: Find site directories for compiled files.
>>>
>>
>> Here in the commit log you need entries for the files you change and the
>> functions you change in them.  See
>> 036cc149e6e52722f16ef25f4203e82abae9bc79 for an example.  I know it's a
>> bit of a drag but it's how it is.  (In Magit, if you use that, you can
>> press C in a diff to make a template in the log.)
>>
>>> -# GUILE_SITE_DIR -- find path to Guile "site" directory
>>> +# GUILE_SITE_DIR -- find path to Guile site directories
>>>  #
>>>  # Usage: GUILE_SITE_DIR
>>>  #
>>> -# This looks for Guile's "site" directory, usually something like
>>> -# PREFIX/share/guile/site, and sets var @var{GUILE_SITE} to the path.
>>> -# Note that the var name is different from the macro name.
>>> +# This looks for Guile's "site" directories.  The variable @var{GUILE_SITE} will
>>> +# be set to Guile's "site" directory for Scheme source files (usually something like
>>> +# PREFIX/share/guile/site).  @var{GUILE_SITE_CCACHE} will be set to the directory
>>> +# for compiled Scheme files also known as @code{.go} files
>>> +# (usually something like PREFIX/lib/guile/@var{GUILE_EFFECTIVE_VERSION}/site-ccache).
>>> +# @var{GUILE_EXTENSION} will be set to the directory for compiled C extensions
>>> +# (usually something like # PREFIX/lib/guile/@var{GUILE_EFFECTIVE_VERSION}/extensions).
>>> +# The latter two are set to blank if the particular version of Guile does not support
>>> +# them.  Note that this macro will run the macros @code{GUILE_PKG} and @code{GUILE_PROGS}
>>> +# if they have not already been run.
>>
>> Please limit lines to < 80 characters.  If you use emacs, you can fix
>> with M-q, provided your fill-column is set appropriately.
>>
>>>    AC_SUBST(GUILE_SITE)
>>> +  AC_MSG_CHECKING([for Guile site-ccache directory using pkgconfig])
>>> +  GUILE_SITE_CCACHE=`$PKG_CONFIG --print-errors --variable=siteccachedir guile-$GUILE_EFFECTIVE_VERSION`
>>
>> Is --print-errors the right thing here?  I guess this causes some text
>> to spew on the console for 2.0.  Probably not the right thing if we're
>> going to fall back.
>>
>> Otherwise good.  Apologies for the nit-picking; I'm doing it now just so
>> that things are fluid in the future :)
>>
>> Andy

[-- Attachment #2: 0001-GUILE_SITE_DIR-updated-to-find-compiled-site-directo.patch --]
[-- Type: text/x-patch, Size: 4415 bytes --]

From 09e2d1075a7c48e408a5ddaf8b7bf4578b455aa9 Mon Sep 17 00:00:00 2001
From: Freja Nordsiek <fnordsie@gmail.com>
Date: Tue, 14 Mar 2017 17:05:09 +0100
Subject: [PATCH] GUILE_SITE_DIR: updated to find compiled site directories

* meta/guile.m4: GUILE_SITE_DIR updated to find compiled site directories
* meta/guile-2.2.pc.in: added entry for site-ccache directory
---
 meta/guile-2.2.pc.in |  1 +
 meta/guile.m4        | 44 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/meta/guile-2.2.pc.in b/meta/guile-2.2.pc.in
index c8f485b..c6d12b5 100644
--- a/meta/guile-2.2.pc.in
+++ b/meta/guile-2.2.pc.in
@@ -10,6 +10,7 @@ pkgincludedir=@includedir@/guile
 
 sitedir=@sitedir@
 extensiondir=@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/extensions
+siteccachedir=@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache
 libguileinterface=@LIBGUILE_INTERFACE@
 
 # Actual name of the 'guile' and 'guild' programs.  This is
diff --git a/meta/guile.m4 b/meta/guile.m4
index b0ef9be..23c2c63 100644
--- a/meta/guile.m4
+++ b/meta/guile.m4
@@ -25,7 +25,7 @@
 ## GUILE_PKG -- find Guile development files
 ## GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
 ## GUILE_FLAGS -- set flags for compiling and linking with Guile
-## GUILE_SITE_DIR -- find path to Guile "site" directory
+## GUILE_SITE_DIR -- find path to Guile "site" directories
 ## GUILE_CHECK -- evaluate Guile Scheme code and capture the return value
 ## GUILE_MODULE_CHECK -- check feature of a Guile Scheme module
 ## GUILE_MODULE_AVAILABLE -- check availability of a Guile Scheme module
@@ -154,18 +154,28 @@ AC_DEFUN([GUILE_FLAGS],
   AC_SUBST([GUILE_LTLIBS])
  ])
 
-# GUILE_SITE_DIR -- find path to Guile "site" directory
+# GUILE_SITE_DIR -- find path to Guile site directories
 #
 # Usage: GUILE_SITE_DIR
 #
-# This looks for Guile's "site" directory, usually something like
-# PREFIX/share/guile/site, and sets var @var{GUILE_SITE} to the path.
-# Note that the var name is different from the macro name.
+# This looks for Guile's "site" directories.  The variable @var{GUILE_SITE} will
+# be set to Guile's "site" directory for Scheme source files (usually something
+# like PREFIX/share/guile/site).  @var{GUILE_SITE_CCACHE} will be set to the
+# directory for compiled Scheme files also known as @code{.go} files
+# (usually something like
+# PREFIX/lib/guile/@var{GUILE_EFFECTIVE_VERSION}/site-ccache).
+# @var{GUILE_EXTENSION} will be set to the directory for compiled C extensions
+# (usually something like
+# PREFIX/lib/guile/@var{GUILE_EFFECTIVE_VERSION}/extensions). The latter two
+# are set to blank if the particular version of Guile does not support
+# them.  Note that this macro will run the macros @code{GUILE_PKG} and
+# @code{GUILE_PROGS} if they have not already been run.
 #
-# The variable is marked for substitution, as by @code{AC_SUBST}.
+# The variables are marked for substitution, as by @code{AC_SUBST}.
 #
 AC_DEFUN([GUILE_SITE_DIR],
  [AC_REQUIRE([GUILE_PKG])
+  AC_REQUIRE([GUILE_PROGS])
   AC_MSG_CHECKING(for Guile site directory)
   GUILE_SITE=`$PKG_CONFIG --print-errors --variable=sitedir guile-$GUILE_EFFECTIVE_VERSION`
   AC_MSG_RESULT($GUILE_SITE)
@@ -173,6 +183,28 @@ AC_DEFUN([GUILE_SITE_DIR],
      AC_MSG_FAILURE(sitedir not found)
   fi
   AC_SUBST(GUILE_SITE)
+  AC_MSG_CHECKING([for Guile site-ccache directory using pkgconfig])
+  GUILE_SITE_CCACHE=`$PKG_CONFIG --variable=siteccachedir guile-$GUILE_EFFECTIVE_VERSION`
+  if test "$GUILE_SITE_CCACHE" = ""; then
+    AC_MSG_RESULT(no)
+    AC_MSG_CHECKING([for Guile site-ccache directory using interpreter])
+    GUILE_SITE_CCACHE=`$GUILE -c "(display (if (defined? '%site-ccache-dir) (%site-ccache-dir) \"\"))"`
+    if test $? != "0" -o "$GUILE_SITE_CCACHE" = ""; then
+      AC_MSG_RESULT(no)
+      GUILE_SITE_CCACHE=""
+      AC_MSG_WARN([siteccachedir not found])
+    fi
+  fi
+  AC_MSG_RESULT($GUILE_SITE_CCACHE)
+  AC_SUBST([GUILE_SITE_CCACHE])
+  AC_MSG_CHECKING(for Guile extensions directory)
+  GUILE_EXTENSION=`$PKG_CONFIG --print-errors --variable=extensiondir guile-$GUILE_EFFECTIVE_VERSION`
+  AC_MSG_RESULT($GUILE_EXTENSION)
+  if test "$GUILE_EXTENSION" = ""; then
+    GUILE_EXTENSION=""
+    AC_MSG_WARN(extensiondir not found)
+  fi
+  AC_SUBST(GUILE_EXTENSION)
  ])
 
 # GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
-- 
2.9.3