CVS commit: pkgsrc/mk/platform

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jan 24 12:36:28 UTC 2020

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

Log Message:
mk/platform/Linux.mk: Use _OPSYS_LIB_DIRS to find glibc paths.

This seems more correct as it handles Debian/others already.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 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.81 pkgsrc/mk/platform/Linux.mk:1.82
--- pkgsrc/mk/platform/Linux.mk:1.81    Fri Jan 24 12:32:21 2020
+++ pkgsrc/mk/platform/Linux.mk Fri Jan 24 12:36:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.81 2020/01/24 12:32:21 nia Exp $
+# $NetBSD: Linux.mk,v 1.82 2020/01/24 12:36:28 nia Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -167,13 +167,10 @@ _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})
+.for _glibc_path in ${_OPSYS_LIB_DIRS}
+.  if exists(${_glibc_path}/libc.so.6)
 ## Use _CMD so the command only gets run when needed!
-_GLIBC_VERSION_CMD=    ${_glibc_path} --version | \
+_GLIBC_VERSION_CMD=    ${_glibc_path}/libc.so.6 --version | \
                                sed -ne's/^GNU C.*version \(.*\),.*$$/\1/p'
 GLIBC_VERSION=         ${_GLIBC_VERSION_CMD:sh}
 .  endif