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.mk: Use _OPSYS_LIB_DIRS ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/97b31e436b16
branches: trunk
changeset: 410544:97b31e436b16
user: nia <nia%pkgsrc.org@localhost>
date: Fri Jan 24 12:36:28 2020 +0000
description:
mk/platform/Linux.mk: Use _OPSYS_LIB_DIRS to find glibc paths.
This seems more correct as it handles Debian/others already.
diffstat:
mk/platform/Linux.mk | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diffs (26 lines):
diff -r ece7c7153abe -r 97b31e436b16 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk Fri Jan 24 12:32:21 2020 +0000
+++ b/mk/platform/Linux.mk Fri Jan 24 12:36:28 2020 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index