From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Freja Nordsiek Newsgroups: gmane.lisp.guile.devel Subject: 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 Date: Tue, 14 Mar 2017 17:10:45 +0100 Message-ID: References: <878to9s5s9.fsf@pobox.com> <87h92v7vw3.fsf@pobox.com> <87y3w76edw.fsf@pobox.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a114924400f0e4a054ab312c2 X-Trace: blaine.gmane.org 1489507857 7842 195.159.176.226 (14 Mar 2017 16:10:57 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 14 Mar 2017 16:10:57 +0000 (UTC) Cc: guile-devel@gnu.org To: Andy Wingo Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Tue Mar 14 17:10:52 2017 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnp28-0001Cn-1F for guile-devel@m.gmane.org; Tue, 14 Mar 2017 17:10:48 +0100 Original-Received: from localhost ([::1]:60513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnp2E-0006Fj-73 for guile-devel@m.gmane.org; Tue, 14 Mar 2017 12:10:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnp29-0006F3-6j for guile-devel@gnu.org; Tue, 14 Mar 2017 12:10:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnp27-0003Ff-GM for guile-devel@gnu.org; Tue, 14 Mar 2017 12:10:49 -0400 Original-Received: from mail-wr0-x22e.google.com ([2a00:1450:400c:c0c::22e]:35011) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cnp27-0003FP-5v for guile-devel@gnu.org; Tue, 14 Mar 2017 12:10:47 -0400 Original-Received: by mail-wr0-x22e.google.com with SMTP id g10so127371175wrg.2 for ; Tue, 14 Mar 2017 09:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=atkMNvq7kBiuN7eQuRCvIjR3Zu/AlqIvhLgVdhJNzCw=; b=P/TO+vxbgJHVKmZXEc8KaPMZWfewkPKOjtp1hskO/jNgyM3O76gYjs7k1Ci77eGM45 d5SUxt1pMX4g94QBgUAifYbxBoREki3wdT8InPnyCRmf1IbBgELtAjBFTUuYHXxXwLwQ hSCeJR0HrvDsk1/jazQJS+7va3cSTFf0ayWPVO2IHXioqbIgL5BWe3xs5vRKtQeJAlmT mE1danlnGUwrko/aZzsr/AEfuMNMzeFnjaNb00fmqFp3DL7UfCvSAntCiwwsi1uhTysQ ww0v/Du0mRy5CsG1dh1Emvc00/oO1xdgZB53gfKGbmWedbxXdOxk7SmLeIWg9nro3H6N OlCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=atkMNvq7kBiuN7eQuRCvIjR3Zu/AlqIvhLgVdhJNzCw=; b=iREnAzGmYPYZ+2xhVljhE4iwD+vTHWPMUiI8/5sRCg+GZEEfi6/u0I1eWCGYrYtdmy 4FcXeL1z+MB0s22zQopRvzLKxCxeoM6XJlVx82E4LiT773tNyEQEUXycfB77ke2hKuIF FvwaxyLM8czNTF+o+YacyTU86qxvObeF7Z5PFoCwrx9Jxrrj2kpstjjOfWTTMeEpx1Bd NIIfnDC2VoUxWVI4RjA0ZzdmbhNDfyXtHxLq9cSkezbRQUweKvyQ+2VIAFd+SUgg7hrC 5gd26izbko93f0/6EYnDQ/rscsrQYuxnzERTXuiIIFykThFUgQXnvDvGFGlc6SS99AYO B2nA== X-Gm-Message-State: AMke39lSuTeAzKRwkna/vRQhcPvPFcoOOsN8yWfY+btuJqWBbEsYBA9OUWnR+U5sHV1zjz39/fPiqbplQueIDQ== X-Received: by 10.223.134.69 with SMTP id 5mr36009444wrw.22.1489507846107; Tue, 14 Mar 2017 09:10:46 -0700 (PDT) Original-Received: by 10.28.234.73 with HTTP; Tue, 14 Mar 2017 09:10:45 -0700 (PDT) In-Reply-To: <87y3w76edw.fsf@pobox.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22e X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.org gmane.lisp.guile.devel:19051 Archived-At: --001a114924400f0e4a054ab312c2 Content-Type: text/plain; charset=UTF-8 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 wrote: > Heya :) > > On Tue 14 Mar 2017 16:31, Freja Nordsiek writes: > >> From 41498549ac22ea50e497887b3a1e002985bb6f8f Mon Sep 17 00:00:00 2001 >> From: Freja Nordsiek >> 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 --001a114924400f0e4a054ab312c2 Content-Type: text/x-patch; charset=US-ASCII; name="0001-GUILE_SITE_DIR-updated-to-find-compiled-site-directo.patch" Content-Disposition: attachment; filename="0001-GUILE_SITE_DIR-updated-to-find-compiled-site-directo.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j09qie9p0 RnJvbSA0MzhhODkwMmYzOGI4MzhlYjQwNzQ5OWFhMGVkMzc2NjlkYzBiODUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmVqYSBOb3Jkc2llayA8Zm5vcmRzaWVAZ21haWwuY29tPgpE YXRlOiBUdWUsIDE0IE1hciAyMDE3IDE3OjA1OjA5ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gR1VJ TEVfU0lURV9ESVI6IHVwZGF0ZWQgdG8gZmluZCBjb21waWxlZCBzaXRlIGRpcmVjdG9yaWVzCgoq IG1ldGEvZ3VpbGUubTQ6IEdVSUxFX1NJVEVfRElSIHVwZGF0ZWQgdG8gZmluZCBjb21waWxlZCBz aXRlIGRpcmVjdG9yaWVzCi0tLQogbWV0YS9ndWlsZS0yLjIucGMuaW4gfCAgMSArCiBtZXRhL2d1 aWxlLm00ICAgICAgICB8IDQ0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbWV0YS9ndWlsZS0yLjIucGMuaW4gYi9tZXRhL2d1aWxlLTIuMi5wYy5p bgppbmRleCBjOGY0ODViLi5jNmQxMmI1IDEwMDY0NAotLS0gYS9tZXRhL2d1aWxlLTIuMi5wYy5p bgorKysgYi9tZXRhL2d1aWxlLTIuMi5wYy5pbgpAQCAtMTAsNiArMTAsNyBAQCBwa2dpbmNsdWRl ZGlyPUBpbmNsdWRlZGlyQC9ndWlsZQogCiBzaXRlZGlyPUBzaXRlZGlyQAogZXh0ZW5zaW9uZGly PUBsaWJkaXJAL2d1aWxlL0BHVUlMRV9FRkZFQ1RJVkVfVkVSU0lPTkAvZXh0ZW5zaW9ucworc2l0 ZWNjYWNoZWRpcj1AbGliZGlyQC9ndWlsZS9AR1VJTEVfRUZGRUNUSVZFX1ZFUlNJT05AL3NpdGUt Y2NhY2hlCiBsaWJndWlsZWludGVyZmFjZT1ATElCR1VJTEVfSU5URVJGQUNFQAogCiAjIEFjdHVh bCBuYW1lIG9mIHRoZSAnZ3VpbGUnIGFuZCAnZ3VpbGQnIHByb2dyYW1zLiAgVGhpcyBpcwpkaWZm IC0tZ2l0IGEvbWV0YS9ndWlsZS5tNCBiL21ldGEvZ3VpbGUubTQKaW5kZXggYjBlZjliZS4uMjNj MmM2MyAxMDA2NDQKLS0tIGEvbWV0YS9ndWlsZS5tNAorKysgYi9tZXRhL2d1aWxlLm00CkBAIC0y NSw3ICsyNSw3IEBACiAjIyBHVUlMRV9QS0cgLS0gZmluZCBHdWlsZSBkZXZlbG9wbWVudCBmaWxl cwogIyMgR1VJTEVfUFJPR1MgLS0gc2V0IHBhdGhzIHRvIEd1aWxlIGludGVycHJldGVyLCBjb25m aWcgYW5kIHRvb2wgcHJvZ3JhbXMKICMjIEdVSUxFX0ZMQUdTIC0tIHNldCBmbGFncyBmb3IgY29t cGlsaW5nIGFuZCBsaW5raW5nIHdpdGggR3VpbGUKLSMjIEdVSUxFX1NJVEVfRElSIC0tIGZpbmQg cGF0aCB0byBHdWlsZSAic2l0ZSIgZGlyZWN0b3J5CisjIyBHVUlMRV9TSVRFX0RJUiAtLSBmaW5k IHBhdGggdG8gR3VpbGUgInNpdGUiIGRpcmVjdG9yaWVzCiAjIyBHVUlMRV9DSEVDSyAtLSBldmFs dWF0ZSBHdWlsZSBTY2hlbWUgY29kZSBhbmQgY2FwdHVyZSB0aGUgcmV0dXJuIHZhbHVlCiAjIyBH VUlMRV9NT0RVTEVfQ0hFQ0sgLS0gY2hlY2sgZmVhdHVyZSBvZiBhIEd1aWxlIFNjaGVtZSBtb2R1 bGUKICMjIEdVSUxFX01PRFVMRV9BVkFJTEFCTEUgLS0gY2hlY2sgYXZhaWxhYmlsaXR5IG9mIGEg R3VpbGUgU2NoZW1lIG1vZHVsZQpAQCAtMTU0LDE4ICsxNTQsMjggQEAgQUNfREVGVU4oW0dVSUxF X0ZMQUdTXSwKICAgQUNfU1VCU1QoW0dVSUxFX0xUTElCU10pCiAgXSkKIAotIyBHVUlMRV9TSVRF X0RJUiAtLSBmaW5kIHBhdGggdG8gR3VpbGUgInNpdGUiIGRpcmVjdG9yeQorIyBHVUlMRV9TSVRF X0RJUiAtLSBmaW5kIHBhdGggdG8gR3VpbGUgc2l0ZSBkaXJlY3RvcmllcwogIwogIyBVc2FnZTog R1VJTEVfU0lURV9ESVIKICMKLSMgVGhpcyBsb29rcyBmb3IgR3VpbGUncyAic2l0ZSIgZGlyZWN0 b3J5LCB1c3VhbGx5IHNvbWV0aGluZyBsaWtlCi0jIFBSRUZJWC9zaGFyZS9ndWlsZS9zaXRlLCBh bmQgc2V0cyB2YXIgQHZhcntHVUlMRV9TSVRFfSB0byB0aGUgcGF0aC4KLSMgTm90ZSB0aGF0IHRo ZSB2YXIgbmFtZSBpcyBkaWZmZXJlbnQgZnJvbSB0aGUgbWFjcm8gbmFtZS4KKyMgVGhpcyBsb29r cyBmb3IgR3VpbGUncyAic2l0ZSIgZGlyZWN0b3JpZXMuICBUaGUgdmFyaWFibGUgQHZhcntHVUlM RV9TSVRFfSB3aWxsCisjIGJlIHNldCB0byBHdWlsZSdzICJzaXRlIiBkaXJlY3RvcnkgZm9yIFNj aGVtZSBzb3VyY2UgZmlsZXMgKHVzdWFsbHkgc29tZXRoaW5nCisjIGxpa2UgUFJFRklYL3NoYXJl L2d1aWxlL3NpdGUpLiAgQHZhcntHVUlMRV9TSVRFX0NDQUNIRX0gd2lsbCBiZSBzZXQgdG8gdGhl CisjIGRpcmVjdG9yeSBmb3IgY29tcGlsZWQgU2NoZW1lIGZpbGVzIGFsc28ga25vd24gYXMgQGNv ZGV7LmdvfSBmaWxlcworIyAodXN1YWxseSBzb21ldGhpbmcgbGlrZQorIyBQUkVGSVgvbGliL2d1 aWxlL0B2YXJ7R1VJTEVfRUZGRUNUSVZFX1ZFUlNJT059L3NpdGUtY2NhY2hlKS4KKyMgQHZhcntH VUlMRV9FWFRFTlNJT059IHdpbGwgYmUgc2V0IHRvIHRoZSBkaXJlY3RvcnkgZm9yIGNvbXBpbGVk IEMgZXh0ZW5zaW9ucworIyAodXN1YWxseSBzb21ldGhpbmcgbGlrZQorIyBQUkVGSVgvbGliL2d1 aWxlL0B2YXJ7R1VJTEVfRUZGRUNUSVZFX1ZFUlNJT059L2V4dGVuc2lvbnMpLiBUaGUgbGF0dGVy IHR3bworIyBhcmUgc2V0IHRvIGJsYW5rIGlmIHRoZSBwYXJ0aWN1bGFyIHZlcnNpb24gb2YgR3Vp bGUgZG9lcyBub3Qgc3VwcG9ydAorIyB0aGVtLiAgTm90ZSB0aGF0IHRoaXMgbWFjcm8gd2lsbCBy dW4gdGhlIG1hY3JvcyBAY29kZXtHVUlMRV9QS0d9IGFuZAorIyBAY29kZXtHVUlMRV9QUk9HU30g aWYgdGhleSBoYXZlIG5vdCBhbHJlYWR5IGJlZW4gcnVuLgogIwotIyBUaGUgdmFyaWFibGUgaXMg bWFya2VkIGZvciBzdWJzdGl0dXRpb24sIGFzIGJ5IEBjb2Rle0FDX1NVQlNUfS4KKyMgVGhlIHZh cmlhYmxlcyBhcmUgbWFya2VkIGZvciBzdWJzdGl0dXRpb24sIGFzIGJ5IEBjb2Rle0FDX1NVQlNU fS4KICMKIEFDX0RFRlVOKFtHVUlMRV9TSVRFX0RJUl0sCiAgW0FDX1JFUVVJUkUoW0dVSUxFX1BL R10pCisgIEFDX1JFUVVJUkUoW0dVSUxFX1BST0dTXSkKICAgQUNfTVNHX0NIRUNLSU5HKGZvciBH dWlsZSBzaXRlIGRpcmVjdG9yeSkKICAgR1VJTEVfU0lURT1gJFBLR19DT05GSUcgLS1wcmludC1l cnJvcnMgLS12YXJpYWJsZT1zaXRlZGlyIGd1aWxlLSRHVUlMRV9FRkZFQ1RJVkVfVkVSU0lPTmAK ICAgQUNfTVNHX1JFU1VMVCgkR1VJTEVfU0lURSkKQEAgLTE3Myw2ICsxODMsMjggQEAgQUNfREVG VU4oW0dVSUxFX1NJVEVfRElSXSwKICAgICAgQUNfTVNHX0ZBSUxVUkUoc2l0ZWRpciBub3QgZm91 bmQpCiAgIGZpCiAgIEFDX1NVQlNUKEdVSUxFX1NJVEUpCisgIEFDX01TR19DSEVDS0lORyhbZm9y IEd1aWxlIHNpdGUtY2NhY2hlIGRpcmVjdG9yeSB1c2luZyBwa2djb25maWddKQorICBHVUlMRV9T SVRFX0NDQUNIRT1gJFBLR19DT05GSUcgLS12YXJpYWJsZT1zaXRlY2NhY2hlZGlyIGd1aWxlLSRH VUlMRV9FRkZFQ1RJVkVfVkVSU0lPTmAKKyAgaWYgdGVzdCAiJEdVSUxFX1NJVEVfQ0NBQ0hFIiA9 ICIiOyB0aGVuCisgICAgQUNfTVNHX1JFU1VMVChubykKKyAgICBBQ19NU0dfQ0hFQ0tJTkcoW2Zv ciBHdWlsZSBzaXRlLWNjYWNoZSBkaXJlY3RvcnkgdXNpbmcgaW50ZXJwcmV0ZXJdKQorICAgIEdV SUxFX1NJVEVfQ0NBQ0hFPWAkR1VJTEUgLWMgIihkaXNwbGF5IChpZiAoZGVmaW5lZD8gJyVzaXRl LWNjYWNoZS1kaXIpICglc2l0ZS1jY2FjaGUtZGlyKSBcIlwiKSkiYAorICAgIGlmIHRlc3QgJD8g IT0gIjAiIC1vICIkR1VJTEVfU0lURV9DQ0FDSEUiID0gIiI7IHRoZW4KKyAgICAgIEFDX01TR19S RVNVTFQobm8pCisgICAgICBHVUlMRV9TSVRFX0NDQUNIRT0iIgorICAgICAgQUNfTVNHX1dBUk4o W3NpdGVjY2FjaGVkaXIgbm90IGZvdW5kXSkKKyAgICBmaQorICBmaQorICBBQ19NU0dfUkVTVUxU KCRHVUlMRV9TSVRFX0NDQUNIRSkKKyAgQUNfU1VCU1QoW0dVSUxFX1NJVEVfQ0NBQ0hFXSkKKyAg QUNfTVNHX0NIRUNLSU5HKGZvciBHdWlsZSBleHRlbnNpb25zIGRpcmVjdG9yeSkKKyAgR1VJTEVf RVhURU5TSU9OPWAkUEtHX0NPTkZJRyAtLXByaW50LWVycm9ycyAtLXZhcmlhYmxlPWV4dGVuc2lv bmRpciBndWlsZS0kR1VJTEVfRUZGRUNUSVZFX1ZFUlNJT05gCisgIEFDX01TR19SRVNVTFQoJEdV SUxFX0VYVEVOU0lPTikKKyAgaWYgdGVzdCAiJEdVSUxFX0VYVEVOU0lPTiIgPSAiIjsgdGhlbgor ICAgIEdVSUxFX0VYVEVOU0lPTj0iIgorICAgIEFDX01TR19XQVJOKGV4dGVuc2lvbmRpciBub3Qg Zm91bmQpCisgIGZpCisgIEFDX1NVQlNUKEdVSUxFX0VYVEVOU0lPTikKICBdKQogCiAjIEdVSUxF X1BST0dTIC0tIHNldCBwYXRocyB0byBHdWlsZSBpbnRlcnByZXRlciwgY29uZmlnIGFuZCB0b29s IHByb2dyYW1zCi0tIAoyLjkuMwoK --001a114924400f0e4a054ab312c2--