pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/platform set LIBABISUFFIX to /aarch64-linux-gnu for...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f8dffb1ce42
branches:  trunk
changeset: 352597:8f8dffb1ce42
user:      richard <richard%pkgsrc.org@localhost>
date:      Sat Sep 17 05:41:37 2016 +0000

description:
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.

diffstat:

 mk/platform/Linux.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r 4045b0817520 -r 8f8dffb1ce42 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Sat Sep 17 05:20:34 2016 +0000
+++ b/mk/platform/Linux.mk      Sat Sep 17 05:41:37 2016 +0000
@@ -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_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}



Home | Main Index | Thread Index | Old Index