Received: by mail.netbsd.org (Postfix, from userid 605) id 5229084D7D; Tue, 28 Jan 2020 08:38:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CC47984D7C for ; Tue, 28 Jan 2020 08:38:48 +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 buOemPVw43uL for ; Tue, 28 Jan 2020 08:38:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2DDBE84D73 for ; Tue, 28 Jan 2020 08:38:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 27883FBF4; Tue, 28 Jan 2020 08:38:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1580200728222590" MIME-Version: 1.0 Date: Tue, 28 Jan 2020 08:38:48 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/mk/platform To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200128083848.27883FBF4@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. --_----------=_1580200728222590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue Jan 28 08:38:48 UTC 2020 Modified Files: pkgsrc/mk/platform: Linux.mk Log Message: mk/platform/Linux: fix detection of GLIBC_VERSION on Debian Running "/lib/x86_64-linux-gnu/libc.so.6 --version" on Debian unstable inside WSL says: GNU C Library (Debian GLIBC 2.29-9) stable release version 2.29. In this case, there is a simple period, not a comma after the version number. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 pkgsrc/mk/platform/Linux.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1580200728222590 Content-Disposition: inline Content-Length: 813 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/platform/Linux.mk diff -u pkgsrc/mk/platform/Linux.mk:1.82 pkgsrc/mk/platform/Linux.mk:1.83 --- pkgsrc/mk/platform/Linux.mk:1.82 Fri Jan 24 12:36:28 2020 +++ pkgsrc/mk/platform/Linux.mk Tue Jan 28 08:38:47 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.82 2020/01/24 12:36:28 nia Exp $ +# $NetBSD: Linux.mk,v 1.83 2020/01/28 08:38:47 rillig Exp $ # # Variable definitions for the Linux operating system. @@ -171,7 +171,7 @@ CWRAPPERS_APPEND.ld+= -m elf_i386 . if exists(${_glibc_path}/libc.so.6) ## Use _CMD so the command only gets run when needed! _GLIBC_VERSION_CMD= ${_glibc_path}/libc.so.6 --version | \ - sed -ne's/^GNU C.*version \(.*\),.*$$/\1/p' + sed -ne's/^GNU C.*version \(.*\)[,.].*$$/\1/p' GLIBC_VERSION= ${_GLIBC_VERSION_CMD:sh} . endif .endfor --_----------=_1580200728222590--