CVS commit: pkgsrc/mk/platform

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 29 17:13:47 UTC 2023

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

Log Message:
mk: Support Arch Linux lib64 directories.

Reported by zagreus on IRC.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 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.93 pkgsrc/mk/platform/Linux.mk:1.94
--- pkgsrc/mk/platform/Linux.mk:1.93    Wed Nov 15 14:14:09 2023
+++ pkgsrc/mk/platform/Linux.mk Wed Nov 29 17:13:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.93 2023/11/15 14:14:09 nia Exp $
+# $NetBSD: Linux.mk,v 1.94 2023/11/29 17:13:47 jperkin Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -88,8 +88,8 @@ _OPSYS_SYSTEM_RPATH=  /lib:/usr/lib:/lib$
 _OPSYS_LIB_DIRS?=      /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
 .  endif
 .elif exists(/etc/arch-release)
-_OPSYS_SYSTEM_RPATH=   /lib:/usr/lib
-_OPSYS_LIB_DIRS?=      /lib /usr/lib
+_OPSYS_SYSTEM_RPATH=   /lib:/usr/lib:/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
+_OPSYS_LIB_DIRS?=      /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
 .elif exists(/etc/NIXOS)
 # NixOS has no fixed locations for system libraries.
 _OPSYS_INCLUDE_DIRS!=  echo "" | cpp -v 2>&1 | grep '^[[:space:]]*/.*include$$' | tr '\n' ' '