CVS commit: pkgsrc/mk/platform

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jan 24 12:32:21 UTC 2020

Modified Files:
        pkgsrc/mk/platform: Linux.mk

Log Message:
mk/platform/Linux.mk: Fix glibc detection on Debian.

Problem identified and patch reviewed/tested by gutteridge, thanks


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 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.80 pkgsrc/mk/platform/Linux.mk:1.81
--- pkgsrc/mk/platform/Linux.mk:1.80    Thu Jan 24 18:40:56 2019
+++ pkgsrc/mk/platform/Linux.mk Fri Jan 24 12:32:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.80 2019/01/24 18:40:56 tnn Exp $
+# $NetBSD: Linux.mk,v 1.81 2020/01/24 12:32:21 nia Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -167,12 +167,17 @@ _WRAP_EXTRA_ARGS.LD+=     -m elf_i386
 CWRAPPERS_APPEND.ld+=  -m elf_i386
 .endif
 
+_GLIBC_PATHS+= /lib${LIBABISUFFIX}/libc.so.6
+_GLIBC_PATHS+= /lib/${MACHINE_ARCH}-linux-gnu/libc.so.6
+
+.for _glibc_path in ${_GLIBC_PATHS}
+.  if exists(${_glibc_path})
 ## Use _CMD so the command only gets run when needed!
-.if exists(/lib${LIBABISUFFIX}/libc.so.6)
-_GLIBC_VERSION_CMD=    /lib${LIBABISUFFIX}/libc.so.6 --version | \
+_GLIBC_VERSION_CMD=    ${_glibc_path} --version | \
                                sed -ne's/^GNU C.*version \(.*\),.*$$/\1/p'
 GLIBC_VERSION=         ${_GLIBC_VERSION_CMD:sh}
-.endif
+.  endif
+.endfor
 
 # If this is defined pass it to the make process. 
 .if defined(NOGCCERROR)