CVS commit: pkgsrc/mk/platform

["Roland Illig" <rillig%netbsd.org@localhost>]

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.

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