Thu May 18 00:04:26 2023 UTC ()
Spaces to tabs.


(schmonz)
diff -r1.91 -r1.92 pkgsrc/mk/platform/Linux.mk
cvs diff -r1.91 -r1.92 pkgsrc/mk/platform/Linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Linux.mk 2022/09/27 08:46:33 1.91
+++ pkgsrc/mk/platform/Linux.mk 2023/05/18 00:04:26 1.92
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Linux.mk,v 1.91 2022/09/27 08:46:33 jperkin Exp $ 1# $NetBSD: Linux.mk,v 1.92 2023/05/18 00:04:26 schmonz Exp $
2# 2#
3# Variable definitions for the Linux operating system. 3# Variable definitions for the Linux operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6.if defined(X11_TYPE) && ${X11_TYPE} == "native" 6.if defined(X11_TYPE) && ${X11_TYPE} == "native"
7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
8IMAKE_TOOLS= gmake # extra tools required when we use imake 8IMAKE_TOOLS= gmake # extra tools required when we use imake
9.endif 9.endif
10IMAKEOPTS+= -DBuildHtmlManPages=NO 10IMAKEOPTS+= -DBuildHtmlManPages=NO
11PKGLOCALEDIR?= share 11PKGLOCALEDIR?= share
12 12
13TYPE?= type # Shell builtin 13TYPE?= type # Shell builtin
14 14
@@ -82,29 +82,29 @@ LIBABISUFFIX?= /aarch64-linux-gnu @@ -82,29 +82,29 @@ LIBABISUFFIX?= /aarch64-linux-gnu
82_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX} 82_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
83_OPSYS_LIB_DIRS?= /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} 83_OPSYS_LIB_DIRS?= /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
84. endif 84. endif
85. if !empty(MACHINE_ARCH:Mpowerpc64le) 85. if !empty(MACHINE_ARCH:Mpowerpc64le)
86LIBABISUFFIX?= /powerpc64le-linux-gnu 86LIBABISUFFIX?= /powerpc64le-linux-gnu
87_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX} 87_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
88_OPSYS_LIB_DIRS?= /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} 88_OPSYS_LIB_DIRS?= /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
89. endif 89. endif
90.elif exists(/etc/arch-release) 90.elif exists(/etc/arch-release)
91_OPSYS_SYSTEM_RPATH= /lib:/usr/lib 91_OPSYS_SYSTEM_RPATH= /lib:/usr/lib
92_OPSYS_LIB_DIRS?= /lib /usr/lib 92_OPSYS_LIB_DIRS?= /lib /usr/lib
93.elif exists(/etc/NIXOS) 93.elif exists(/etc/NIXOS)
94# NixOS has no fixed locations for system libraries. 94# NixOS has no fixed locations for system libraries.
95_OPSYS_INCLUDE_DIRS!= echo "" | cpp -v 2>&1 | grep '^[[:space:]]*/.*include$$' | tr '\n' ' ' 95_OPSYS_INCLUDE_DIRS!= echo "" | cpp -v 2>&1 | grep '^[[:space:]]*/.*include$$' | tr '\n' ' '
96 96
97_OPSYS_LIB_DIRS!= cc -print-search-dirs | awk '/^libraries:/ { $$1=""; $$2=substr($$2, 2); print $$0; }' | tr ':' '\n'  97_OPSYS_LIB_DIRS!= cc -print-search-dirs | awk '/^libraries:/ { $$1=""; $$2=substr($$2, 2); print $$0; }' | tr ':' '\n'
98.else 98.else
99_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX} 99_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
100_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} 100_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
101.endif 101.endif
102_OPSYS_INCLUDE_DIRS?= /usr/include 102_OPSYS_INCLUDE_DIRS?= /usr/include
103 103
104.if !empty(OS_VARIANT:Mchromeos) 104.if !empty(OS_VARIANT:Mchromeos)
105_OPSYS_LIB_DIRS+= /usr/local/lib 105_OPSYS_LIB_DIRS+= /usr/local/lib
106_OPSYS_INCLUDE_DIRS+= /usr/local/include 106_OPSYS_INCLUDE_DIRS+= /usr/local/include
107.endif 107.endif
108 108
109# These are libc builtins 109# These are libc builtins
110_OPSYS_PREFER.getopt?= native 110_OPSYS_PREFER.getopt?= native