CVS commit: pkgsrc/mk/platform

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Sat Sep 17 05:41:37 UTC 2016

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

Log Message:
set LIBABISUFFIX to /aarch64-linux-gnu for arm64
simplifies _OPSYS_SYSTEM_RPATH and _OPSYS_LIB_DIRS
permitting lots of stuff using LIBABISUFFIX to work now.

TODO: probably similar for the armv7 platforms as
the pattern '${MACHINE_ARCH}-${LOWER_OPSYS}-gnu${APPEND_ABI}'
seems like it should work for both.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 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.67 pkgsrc/mk/platform/Linux.mk:1.68
--- pkgsrc/mk/platform/Linux.mk:1.67    Wed Aug 24 05:31:20 2016
+++ pkgsrc/mk/platform/Linux.mk Sat Sep 17 05:41:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.67 2016/08/24 05:31:20 richard Exp $
+# $NetBSD: Linux.mk,v 1.68 2016/09/17 05:41:37 richard Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -67,9 +67,10 @@ _OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}
 _OPSYS_LIB_DIRS?=      /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/arm-linux-gnueabi /usr/lib/arm-linux-gnueabi
 .endif
 .endif
-.if !empty(MACHINE_ARCH:Maarch64*)
-_OPSYS_SYSTEM_RPATH=   /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/aarch64-linux-gnu:/usr/lib/aarch64-linux-gnu
-_OPSYS_LIB_DIRS?=      /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/aarch64-linux-gnu /usr/lib/aarch64-linux-gnu
+.if !empty(MACHINE_ARCH:Maarch64)
+LIBABISUFFIX?=         /aarch64-linux-gnu
+_OPSYS_SYSTEM_RPATH=   /lib:/usr/lib:/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
+_OPSYS_LIB_DIRS?=      /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
 .endif
 .else
 _OPSYS_SYSTEM_RPATH=   /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}