Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 06CD81A921F for ; Thu, 15 Oct 2020 23:32:08 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 76CBB84DD4; Thu, 15 Oct 2020 23:32:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F199D84D35 for ; Thu, 15 Oct 2020 23:32:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 3pjgf5CBFe3v for ; Thu, 15 Oct 2020 23:32:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 47E0484D22 for ; Thu, 15 Oct 2020 23:32:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3C981FB28; Thu, 15 Oct 2020 23:32:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_160280472749860" MIME-Version: 1.0 Date: Thu, 15 Oct 2020 23:32:07 +0000 From: "Michael Forney" Subject: CVS commit: pkgsrc/devel/gettext-lib To: pkgsrc-changes@NetBSD.org Reply-To: mcf@netbsd.org X-Mailer: log_accum Message-Id: <20201015233207.3C981FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_160280472749860 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mcf Date: Thu Oct 15 23:32:07 UTC 2020 Modified Files: pkgsrc/devel/gettext-lib: builtin.mk Log Message: gettext-lib: fix built-in gettext detection on musl Some packages, for example GNU sed, still use old versions of gettext.m4 (serial 67 or older) despite having recent releases. These versions of gettext.m4 fail to detect gettext on musl, which has gettext built-in to libc. While there is some logic in gettext-lib/builtin.mk for this situation, it only covers the case where libintl is separate from libc. To fix this, set the corresponding configure variables when gettext is built-in to libc. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/gettext-lib/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_160280472749860 Content-Disposition: inline Content-Length: 978 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/gettext-lib/builtin.mk diff -u pkgsrc/devel/gettext-lib/builtin.mk:1.48 pkgsrc/devel/gettext-lib/builtin.mk:1.49 --- pkgsrc/devel/gettext-lib/builtin.mk:1.48 Sun Nov 3 10:39:12 2019 +++ pkgsrc/devel/gettext-lib/builtin.mk Thu Oct 15 23:32:07 2020 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.48 2019/11/03 10:39:12 rillig Exp $ +# $NetBSD: builtin.mk,v 1.49 2020/10/15 23:32:07 mcf Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -127,6 +127,13 @@ CONFIGURE_ENV+= gt_cv_func_gnugettext1_ empty(H_NGETTEXT_GETTEXT:M${LOCALBASE}/*) CONFIGURE_ENV+= gt_cv_func_gnugettext2_libintl="yes" . endif +. else +CONFIGURE_ENV+= gt_cv_func_gnugettext_libc="yes" +CONFIGURE_ENV+= gt_cv_func_gnugettext1_libc="yes" +. if empty(H_NGETTEXT_GETTEXT:M__nonexistent__) && \ + empty(H_NGETTEXT_GETTEXT:M${LOCALBASE}/*) +CONFIGURE_ENV+= gt_cv_func_gnugettext2_libc="yes" +. endif . endif . endif . endif --_----------=_160280472749860--