pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/platform mk/platform/Linux: fix detection of GLIBC_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd8a3b5c16f6
branches:  trunk
changeset: 422505:cd8a3b5c16f6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Jan 28 08:38:47 2020 +0000

description:
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.

diffstat:

 mk/platform/Linux.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r b68daa040eac -r cd8a3b5c16f6 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Tue Jan 28 08:16:51 2020 +0000
+++ b/mk/platform/Linux.mk      Tue Jan 28 08:38:47 2020 +0000
@@ -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 @@
 .  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



Home | Main Index | Thread Index | Old Index