From unknown Fri Sep 05 20:55:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#18898: Two portability patches Resent-From: Thomas Klausner Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Wed, 29 Oct 2014 23:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 18898 X-GNU-PR-Package: guile X-GNU-PR-Keywords: To: 18898@debbugs.gnu.org X-Debbugs-Original-To: bug-guile@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.141462634215913 (code B ref -1); Wed, 29 Oct 2014 23:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Oct 2014 23:45:42 +0000 Received: from localhost ([127.0.0.1]:39495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xjcvt-00048a-9h for submit@debbugs.gnu.org; Wed, 29 Oct 2014 19:45:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60086) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xjcn2-0003tu-41 for submit@debbugs.gnu.org; Wed, 29 Oct 2014 19:36:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xjcmr-0000wZ-73 for submit@debbugs.gnu.org; Wed, 29 Oct 2014 19:36:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:48481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjcmr-0000wV-4i for submit@debbugs.gnu.org; Wed, 29 Oct 2014 19:36:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjcmm-0005ks-4H for bug-guile@gnu.org; Wed, 29 Oct 2014 19:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xjcmh-0000r4-3Y for bug-guile@gnu.org; Wed, 29 Oct 2014 19:36:16 -0400 Received: from danbala.ifoer.tuwien.ac.at ([128.130.168.64]:59054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjcmg-0000q2-RN for bug-guile@gnu.org; Wed, 29 Oct 2014 19:36:11 -0400 Received: by danbala.ifoer.tuwien.ac.at (Postfix, from userid 116) id 64114A5AF; Thu, 30 Oct 2014 00:36:08 +0100 (CET) Date: Thu, 30 Oct 2014 00:36:08 +0100 From: Thomas Klausner Message-ID: <20141029233608.GM29037@danbala.tuwien.ac.at> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="kORqDWCi7qDJ0mEj" Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 208.118.235.17 X-Spam-Score: -5.0 (-----) X-Mailman-Approved-At: Wed, 29 Oct 2014 19:45:38 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi! The attached patches against git as of right-now fix two issues: 1. test does not generally support '==' as comparison operator. It's a bash(1) feature; not even GNU coreutils test(1) supports it. Use '=' instead. 2. NetBSD provides newlocale and strcoll_l, but not uselocale. Please merge them. Thanks, Thomas --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-test-does-not-generally-support-as-comparison-operat.patch" >From e984213342d68ab81932baff9c8896bcee2ea704 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Thu, 30 Oct 2014 00:33:39 +0100 Subject: [PATCH 2/2] test does not generally support '==' as comparison operator. It's a bash(1) feature; not even GNU coreutils test(1) supports it. Use '=' instead. --- meta/guile.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/guile.m4 b/meta/guile.m4 index 441dcd4..dd3c212 100644 --- a/meta/guile.m4 +++ b/meta/guile.m4 @@ -231,7 +231,7 @@ AC_DEFUN([GUILE_PROGS], AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found]) fi fi - elif test "$GUILE_EFFECTIVE_VERSION" == "$_major_version.$_minor_version" -a -z "$_micro_version"; then + elif test "$GUILE_EFFECTIVE_VERSION" = "$_major_version.$_minor_version" -a -z "$_micro_version"; then # Allow prereleases that have the right effective version. true else -- 2.1.2 --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-NetBSD-provides-newlocale-and-strcoll_l-but-not-usel.patch" >From 479533676f8a57dca645f02eeafb5de537a2251b Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Thu, 30 Oct 2014 00:33:18 +0100 Subject: [PATCH 1/2] NetBSD provides newlocale and strcoll_l, but not uselocale. Adapt ifdefs to handle this case correctly. --- libguile/i18n.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguile/i18n.c b/libguile/i18n.c index c6b9b84..6fa99fe 100644 --- a/libguile/i18n.c +++ b/libguile/i18n.c @@ -40,7 +40,7 @@ #include #include -#if (defined HAVE_NEWLOCALE) && (defined HAVE_STRCOLL_L) +#if (defined HAVE_NEWLOCALE) && (defined HAVE_STRCOLL_L) && (defined HAVE_USELOCALE) /* The GNU thread-aware locale API is documented in ``Thread-Aware Locale Model, a Proposal'', by Ulrich Drepper: -- 2.1.2 --kORqDWCi7qDJ0mEj-- From unknown Fri Sep 05 20:55:27 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Thomas Klausner Subject: bug#18898: closed (Re: bug#18898: Two portability patches) Message-ID: References: <874mu5hscx.fsf@yeeloong.lan> <20141029233608.GM29037@danbala.tuwien.ac.at> X-Gnu-PR-Message: they-closed 18898 X-Gnu-PR-Package: guile Reply-To: 18898@debbugs.gnu.org Date: Wed, 12 Nov 2014 06:01:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1415772062-31535-1" This is a multi-part message in MIME format... ------------=_1415772062-31535-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #18898: Two portability patches which was filed against the guile package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 18898@debbugs.gnu.org. --=20 18898: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D18898 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1415772062-31535-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 18898-done) by debbugs.gnu.org; 12 Nov 2014 06:00:29 +0000 Received: from localhost ([127.0.0.1]:58057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XoQyj-0008Bk-Ar for submit@debbugs.gnu.org; Wed, 12 Nov 2014 01:00:29 -0500 Received: from world.peace.net ([96.39.62.75]:46128) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XoQyi-0008Bd-7Q for 18898-done@debbugs.gnu.org; Wed, 12 Nov 2014 01:00:28 -0500 Received: from c-24-62-95-23.hsd1.ma.comcast.net ([24.62.95.23] helo=yeeloong.lan) by world.peace.net with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XoQyc-0004Lc-6e; Wed, 12 Nov 2014 01:00:22 -0500 From: Mark H Weaver To: Thomas Klausner Subject: Re: bug#18898: Two portability patches References: <20141029233608.GM29037@danbala.tuwien.ac.at> Date: Wed, 12 Nov 2014 00:59:10 -0500 In-Reply-To: <20141029233608.GM29037@danbala.tuwien.ac.at> (Thomas Klausner's message of "Thu, 30 Oct 2014 00:36:08 +0100") Message-ID: <874mu5hscx.fsf@yeeloong.lan> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 18898-done Cc: 18898-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Thomas Klausner writes: > test does not generally support '==' as comparison operator. > > It's a bash(1) feature; not even GNU coreutils test(1) supports it. > Use '=' instead. Fixed in 03242f398f3520b1b27caf5885c8d5600094f944. > NetBSD provides newlocale and strcoll_l, but not uselocale. Fixed in 30c5982a9548a0ca0ea46111beb490f06d74a40a. FYI, the patch you provided was not sufficient, because it neglected to arrange for HAVE_USELOCALE to be set by configure. This meant that the thread-aware locale API would _never_ be used. These commits are on the stable-2.0 branch and will be included in Guile 2.0.12. I'm closing this bug now. Thanks, Mark ------------=_1415772062-31535-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 29 Oct 2014 23:45:42 +0000 Received: from localhost ([127.0.0.1]:39495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xjcvt-00048a-9h for submit@debbugs.gnu.org; Wed, 29 Oct 2014 19:45:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60086) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xjcn2-0003tu-41 for submit@debbugs.gnu.org; Wed, 29 Oct 2014 19:36:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xjcmr-0000wZ-73 for submit@debbugs.gnu.org; Wed, 29 Oct 2014 19:36:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:48481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjcmr-0000wV-4i for submit@debbugs.gnu.org; Wed, 29 Oct 2014 19:36:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjcmm-0005ks-4H for bug-guile@gnu.org; Wed, 29 Oct 2014 19:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xjcmh-0000r4-3Y for bug-guile@gnu.org; Wed, 29 Oct 2014 19:36:16 -0400 Received: from danbala.ifoer.tuwien.ac.at ([128.130.168.64]:59054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xjcmg-0000q2-RN for bug-guile@gnu.org; Wed, 29 Oct 2014 19:36:11 -0400 Received: by danbala.ifoer.tuwien.ac.at (Postfix, from userid 116) id 64114A5AF; Thu, 30 Oct 2014 00:36:08 +0100 (CET) Date: Thu, 30 Oct 2014 00:36:08 +0100 From: Thomas Klausner To: bug-guile@gnu.org Subject: Two portability patches Message-ID: <20141029233608.GM29037@danbala.tuwien.ac.at> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="kORqDWCi7qDJ0mEj" Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 208.118.235.17 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Wed, 29 Oct 2014 19:45:38 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi! The attached patches against git as of right-now fix two issues: 1. test does not generally support '==' as comparison operator. It's a bash(1) feature; not even GNU coreutils test(1) supports it. Use '=' instead. 2. NetBSD provides newlocale and strcoll_l, but not uselocale. Please merge them. Thanks, Thomas --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-test-does-not-generally-support-as-comparison-operat.patch" >From e984213342d68ab81932baff9c8896bcee2ea704 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Thu, 30 Oct 2014 00:33:39 +0100 Subject: [PATCH 2/2] test does not generally support '==' as comparison operator. It's a bash(1) feature; not even GNU coreutils test(1) supports it. Use '=' instead. --- meta/guile.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/guile.m4 b/meta/guile.m4 index 441dcd4..dd3c212 100644 --- a/meta/guile.m4 +++ b/meta/guile.m4 @@ -231,7 +231,7 @@ AC_DEFUN([GUILE_PROGS], AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found]) fi fi - elif test "$GUILE_EFFECTIVE_VERSION" == "$_major_version.$_minor_version" -a -z "$_micro_version"; then + elif test "$GUILE_EFFECTIVE_VERSION" = "$_major_version.$_minor_version" -a -z "$_micro_version"; then # Allow prereleases that have the right effective version. true else -- 2.1.2 --kORqDWCi7qDJ0mEj Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-NetBSD-provides-newlocale-and-strcoll_l-but-not-usel.patch" >From 479533676f8a57dca645f02eeafb5de537a2251b Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Thu, 30 Oct 2014 00:33:18 +0100 Subject: [PATCH 1/2] NetBSD provides newlocale and strcoll_l, but not uselocale. Adapt ifdefs to handle this case correctly. --- libguile/i18n.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libguile/i18n.c b/libguile/i18n.c index c6b9b84..6fa99fe 100644 --- a/libguile/i18n.c +++ b/libguile/i18n.c @@ -40,7 +40,7 @@ #include #include -#if (defined HAVE_NEWLOCALE) && (defined HAVE_STRCOLL_L) +#if (defined HAVE_NEWLOCALE) && (defined HAVE_STRCOLL_L) && (defined HAVE_USELOCALE) /* The GNU thread-aware locale API is documented in ``Thread-Aware Locale Model, a Proposal'', by Ulrich Drepper: -- 2.1.2 --kORqDWCi7qDJ0mEj-- ------------=_1415772062-31535-1--