diff options
| author | richard <richard@pkgsrc.org> | 2016-09-17 05:41:37 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2016-09-17 05:41:37 +0000 |
| commit | 3f9eb598b82753d7d3e5a32a4092b5d083dde4bc (patch) | |
| tree | 698b27f9274d6a30ee6ba8c94973d5436e2e95c5 | |
| parent | 5b42f2905aad647913b2146ea1e7c51eea3b3a9b (diff) | |
| download | pkgsrc-3f9eb598b82753d7d3e5a32a4092b5d083dde4bc.tar.gz | |
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.
| -rw-r--r-- | mk/platform/Linux.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index 5762e340f29..3e1348fda55 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -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}:/usr/lib${LIBABISUFFIX}:/lib/arm-linux- _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} |