From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel Subject: guile-lib - devel branch - 4 patches Date: Sat, 22 Oct 2016 23:06:53 -0200 Message-ID: <20161022230653.492af74b@capac> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/DRs_+fi=Q.Q0b3v8sPG_OoK"; protocol="application/pgp-signature" X-Trace: blaine.gmane.org 1477184867 5631 195.159.176.226 (23 Oct 2016 01:07:47 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 23 Oct 2016 01:07:47 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sun Oct 23 03:07:43 2016 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 1by7GD-0000Ii-9T for guile-devel@m.gmane.org; Sun, 23 Oct 2016 03:07:37 +0200 Original-Received: from localhost ([::1]:39306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1by7GF-0003bh-9v for guile-devel@m.gmane.org; Sat, 22 Oct 2016 21:07:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1by7GA-0003bN-1f for guile-devel@gnu.org; Sat, 22 Oct 2016 21:07:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1by7G6-0000As-TB for guile-devel@gnu.org; Sat, 22 Oct 2016 21:07:34 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:51072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1by7G6-00007X-KJ for guile-devel@gnu.org; Sat, 22 Oct 2016 21:07:30 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id 4C47FA04C12C for ; Sun, 23 Oct 2016 03:07:10 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id 5WUF0cIGF0cI for ; Sun, 23 Oct 2016 03:07:05 +0200 (CEST) Original-Received: from capac (unknown [177.40.199.222]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id B12E1A04C0E0 for ; Sun, 23 Oct 2016 03:07:04 +0200 (CEST) X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 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:18728 Archived-At: --Sig_/DRs_+fi=Q.Q0b3v8sPG_OoK Content-Type: multipart/mixed; boundary="MP_/W7NIZK/YSUscjUlmA+.KKJE" --MP_/W7NIZK/YSUscjUlmA+.KKJE Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hello Guilers, Attached 4 patches, review welcome. Unless negative feedback, I should push these, merge to master and release = Guile-Lib 0.2.4 within the next few days. David. --MP_/W7NIZK/YSUscjUlmA+.KKJE Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-Fixing-GUILE_SITE_CCACHE_DIR-m4-macro.patch =46rom e8ea99f9e7698aae5dcdaa314a1f80f1618ca3c1 Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Sat, 22 Oct 2016 22:28:20 -0200 Subject: [PATCH 1/4] Fixing GUILE_SITE_CCACHE_DIR m4 macro * m4/guile.m4: Report $GUILE_SITE_CCACHE, not $_guile_lib. --- m4/guile.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/guile.m4 b/m4/guile.m4 index 6381b13..ce44fc9 100644 --- a/m4/guile.m4 +++ b/m4/guile.m4 @@ -235,11 +235,11 @@ AC_DEFUN([GUILE_SITE_CCACHE_DIR], [AC_REQUIRE([GUILE_PKG]) AC_MSG_CHECKING(for Guile site-ccache directory) _guile_lib=3D`$PKG_CONFIG --print-errors --variable=3Dlibdir guile-$GUIL= E_EFFECTIVE_VERSION` - AC_MSG_RESULT($_guile_lib) if test "$_guile_lib" =3D ""; then AC_MSG_FAILURE(libdir not found) fi GUILE_SITE_CCACHE=3D$_guile_lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccac= he + AC_MSG_RESULT($GUILE_SITE_CCACHE) AC_SUBST(GUILE_SITE_CCACHE) ]) =20 --=20 2.9.3 --MP_/W7NIZK/YSUscjUlmA+.KKJE Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-Fixing-a-deprecated-param-in-Guile-2.2.patch =46rom 551050e647e07671968a82c74d417328b858566d Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Sat, 22 Oct 2016 22:31:06 -0200 Subject: [PATCH 2/4] Fixing a deprecated param in Guile-2.2 * src/os/process.scm: _IONBF setvbuf mode deprecated in Guile-2.2, use 'none instead. --- src/os/process.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/os/process.scm b/src/os/process.scm index 0dd302d..57a3bdc 100644 --- a/src/os/process.scm +++ b/src/os/process.scm @@ -141,7 +141,10 @@ Examples: ;;; matter, making it unbuffered would just slow things down. (define (unbuffered-pipe) (let ((result (pipe))) - (setvbuf (cdr result) _IONBF) + (cond-expand (guile-2.2 + (setvbuf (cdr result) 'none)) + (guile-2 + (setvbuf (cdr result) _IONBF))) result)) =20 ;;; generate the code needed to set up redirections for a child process. --=20 2.9.3 --MP_/W7NIZK/YSUscjUlmA+.KKJE Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0003-Simplifying-the-src-EXTRA_DIST-definition.patch =46rom 025bde9f5efc410300f2aa6083f5726c5bc60068 Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Sat, 22 Oct 2016 22:35:21 -0200 Subject: [PATCH 3/4] Simplifying the src EXTRA_DIST definition * src/Makefile.am: $(SOURCES) already filters wrt statprof, sxml and texinfo, no need to have EXTRA_DIST 'predefs' in the 'if HAVE_GUILE_COMPILE ... else ...'. --- src/Makefile.am | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index dede64d..b120f00 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,19 +68,12 @@ SXML_SOURCES =3D TEXINFO_SOURCES =3D STATPROF_SOURCES =3D =20 -EXTRA_DIST =3D \ - $(SXML_FILES) \ - $(TEXINFO_FILES) \ - $(STATPROF_FILES) - else !HAVE_GUILE_COMPILE =20 SXML_SOURCES =3D $(SXML_FILES) TEXINFO_SOURCES =3D $(TEXINFO_FILES) STATPROF_SOURCES =3D $(STATPROF_FILES) =20 -EXTRA_DIST =3D - endif !HAVE_GUILE_COMPILE =20 =20 @@ -128,7 +121,7 @@ endif nobase_mod_DATA =3D $(SOURCES) $(NOCOMP_SOURCES) nobase_go_DATA =3D $(GOBJECTS) =20 -EXTRA_DIST +=3D \ +EXTRA_DIST =3D \ $(SOURCES) \ $(NOCOMP_SOURCES) =20 --=20 2.9.3 --MP_/W7NIZK/YSUscjUlmA+.KKJE Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0004-Do-not-check-what-is-not-installed.patch =46rom 2c98302ea26f5235761540c20e0c563662ab6083 Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Sat, 22 Oct 2016 22:42:31 -0200 Subject: [PATCH 4/4] Do not check what is not installed. * unit-tests/Makefile.am: Adapting the test suite Makefile.am so it does not run a check neither install the test suite code for modules that are not installed anymore (because they became part of Guile core). --- unit-tests/Makefile.am | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/unit-tests/Makefile.am b/unit-tests/Makefile.am index b3df899..af7acdc 100644 --- a/unit-tests/Makefile.am +++ b/unit-tests/Makefile.am @@ -25,6 +25,36 @@ #### =20 =20 +TEST_SXML_FILES =3D \ + sxml.fold.scm \ + sxml.ssax.scm \ + sxml.transform.scm \ + sxml.xpath.scm + +TEST_TEXINFO_FILES =3D \ + texinfo.scm \ + texinfo.docbook.scm \ + texinfo.serialize.scm \ + text.parse-lalr.scm + +TEST_STATPROF_FILES =3D \ + statprof.scm + + +if HAVE_GUILE_COMPILE + +TEST_SXML_SOURCES =3D +TEST_TEXINFO_SOURCES =3D +TEST_STATPROF_SOURCES =3D + +else !HAVE_GUILE_COMPILE + +TEST_SXML_SOURCES =3D $(TEST_SXML_FILES) +TEST_TEXINFO_SOURCES =3D $(TEST_TEXINFO_FILES) +TEST_STATPROF_SOURCES =3D $(TEST_STATPROF_FILES) + +endif !HAVE_GUILE_COMPILE + TESTS=3D \ api.scm \ container.async-queue.scm \ @@ -37,20 +67,14 @@ TESTS=3D \ md5.scm \ os.process.scm \ search.basic.scm \ - statprof.scm \ + $(TEST_STATPROF_SOURCES) \ scheme.kwargs.scm \ string.completion.scm \ string.transform.scm \ string.wrap.scm \ - sxml.fold.scm \ - sxml.ssax.scm \ - sxml.transform.scm \ - sxml.xpath.scm \ + $(TEST_SXML_SOURCES) \ term.ansi-color.scm \ - texinfo.scm \ - texinfo.docbook.scm \ - texinfo.serialize.scm \ - text.parse-lalr.scm + $(TEST_TEXINFO_SOURCES) =20 TESTS_ENVIRONMENT=3D \ API_FILE=3D$(srcdir)/guile-library.api \ --=20 2.9.3 --MP_/W7NIZK/YSUscjUlmA+.KKJE-- --Sig_/DRs_+fi=Q.Q0b3v8sPG_OoK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEcBAEBCAAGBQJYDA0tAAoJEPN0/ZOjBXrXQxIH/2ZeGB49/LDmvZa3LZ3HZFIw vK5Pgm6fgVGe+9ZG4IRjvCBdf0YDK06L8SinsC2owe5ZQVJmhOQeBIv+PJ+XrLwJ hFTnEW3nY8iRWSaocwQqEPng4vbamMlEC3y+IxTEd33DUgs5LDlLbMrh+mC2qbBr 9QsMwXrxEKeqZqrwOB3aJSb9P6LxlQdRLwwwuivC/Uz3pPGF614F1IDSkmXWnXXZ TgqU88EutZcV3bZz7Ww8ZpdTsLqGfhD+UtE1HaHUyDUUjz8uNe4icFhCPHpB6+MH y+DGcbpnq3RoKlyg6SlQk6hmHmymWD2cykLxsm08QYf2nCVdp7Kw/5/3ZAex6bM= =ud+K -----END PGP SIGNATURE----- --Sig_/DRs_+fi=Q.Q0b3v8sPG_OoK--