Thu Apr 6 11:39:27 2023 UTC ()
gcc10: simplify opsys match


(wiz)
diff -r1.3 -r1.4 pkgsrc/lang/gcc10/options.mk
cvs diff -r1.3 -r1.4 pkgsrc/lang/gcc10/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc10/options.mk 2023/03/29 20:44:52 1.3
+++ pkgsrc/lang/gcc10/options.mk 2023/04/06 11:39:26 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2023/03/29 20:44:52 joerg Exp $ 1# $NetBSD: options.mk,v 1.4 2023/04/06 11:39:26 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} 3PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
4PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \ 4PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
5 gcc-go gcc-objc gcc-objc++ gcc-graphite \ 5 gcc-go gcc-objc gcc-objc++ gcc-graphite \
6 always-libgcc 6 always-libgcc
7PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \ 7PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
8 gcc-graphite gcc-inplace-math 8 gcc-graphite gcc-inplace-math
9 9
10.if ${OPSYS} == "NetBSD" 10.if ${OPSYS} == "NetBSD"
11PKG_SUGGESTED_OPTIONS+= nls 11PKG_SUGGESTED_OPTIONS+= nls
12.elif ${OPSYS} == "Linux" 12.elif ${OPSYS} == "Linux"
13PKG_SUGGESTED_OPTIONS+= nls 13PKG_SUGGESTED_OPTIONS+= nls
14.elif ${OPSYS} == "DragonFly" 14.elif ${OPSYS} == "DragonFly"
@@ -17,27 +17,27 @@ PKG_SUGGESTED_OPTIONS+= nls @@ -17,27 +17,27 @@ PKG_SUGGESTED_OPTIONS+= nls
17PKG_SUGGESTED_OPTIONS+= gcc-inplace-math always-libgcc 17PKG_SUGGESTED_OPTIONS+= gcc-inplace-math always-libgcc
18.else 18.else
19.endif 19.endif
20 20
21.include "../../mk/compiler.mk" 21.include "../../mk/compiler.mk"
22.if empty(PKGSRC_COMPILER:Mgcc) 22.if empty(PKGSRC_COMPILER:Mgcc)
23PKG_SUGGESTED_OPTIONS+= always-libgcc 23PKG_SUGGESTED_OPTIONS+= always-libgcc
24.endif 24.endif
25 25
26### 26###
27### Determine if multilib is avalible. 27### Determine if multilib is avalible.
28### 28###
29MULTILIB_SUPPORTED?= unknown 29MULTILIB_SUPPORTED?= unknown
30.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 30.if ${MACHINE_PLATFORM:MLinux-*-x86_64}
31. if exists(/usr/include/x86_64-linux-gnu/gnu) 31. if exists(/usr/include/x86_64-linux-gnu/gnu)
32_GNU_INCLUDE_DIR= /usr/include/x86_64-linux-gnu/gnu 32_GNU_INCLUDE_DIR= /usr/include/x86_64-linux-gnu/gnu
33. else 33. else
34_GNU_INCLUDE_DIR= /usr/include/gnu 34_GNU_INCLUDE_DIR= /usr/include/gnu
35. endif 35. endif
36. if exists(${_GNU_INCLUDE_DIR}/stubs-64.h) && \ 36. if exists(${_GNU_INCLUDE_DIR}/stubs-64.h) && \
37 !exists(${_GNU_INCLUDE_DIR}/stubs-32.h) 37 !exists(${_GNU_INCLUDE_DIR}/stubs-32.h)
38MULTILIB_SUPPORTED= No 38MULTILIB_SUPPORTED= No
39. else 39. else
40MULTILIB_SUPPORTED= Yes 40MULTILIB_SUPPORTED= Yes
41. endif 41. endif
42.endif 42.endif
43.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) 43.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])