Wed May 2 18:38:30 2018 UTC ()
lang/gcc7: Refine the condition to enable multilib


(minskim)
diff -r1.2 -r1.3 pkgsrc/lang/gcc7/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/lang/gcc7/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc7/options.mk 2017/05/10 15:02:29 1.2
+++ pkgsrc/lang/gcc7/options.mk 2018/05/02 18:38:30 1.3
@@ -1,39 +1,44 @@ @@ -1,39 +1,44 @@
1# $NetBSD: options.mk,v 1.2 2017/05/10 15:02:29 jperkin Exp $ 1# $NetBSD: options.mk,v 1.3 2018/05/02 18:38:30 minskim 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
6PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \ 6PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
7 gcc-graphite gcc-inplace-math 7 gcc-graphite gcc-inplace-math
8 8
9.if ${OPSYS} == "NetBSD" 9.if ${OPSYS} == "NetBSD"
10PKG_SUGGESTED_OPTIONS+= nls 10PKG_SUGGESTED_OPTIONS+= nls
11.elif ${OPSYS} == "Linux" 11.elif ${OPSYS} == "Linux"
12PKG_SUGGESTED_OPTIONS+= nls 12PKG_SUGGESTED_OPTIONS+= nls
13.elif ${OPSYS} == "DragonFly" 13.elif ${OPSYS} == "DragonFly"
14PKG_SUGGESTED_OPTIONS+= nls 14PKG_SUGGESTED_OPTIONS+= nls
15.elif ${OPSYS} == "SunOS" 15.elif ${OPSYS} == "SunOS"
16PKG_SUGGESTED_OPTIONS+= gcc-inplace-math 16PKG_SUGGESTED_OPTIONS+= gcc-inplace-math
17.else 17.else
18.endif 18.endif
19 19
20### 20###
21### Determine if multilib is avalible. 21### Determine if multilib is avalible.
22### 22###
23MULTILIB_SUPPORTED?= unknown 23MULTILIB_SUPPORTED?= unknown
24.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 24.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
25. if exists(/usr/include/gnu/stubs-64.h) && \ 25. if exists(/usr/include/x86_64-linux-gnu/gnu)
26 !exists(/usr/include/gnu/stubs-32.h) 26_GNU_INCLUDE_DIR= /usr/include/x86_64-linux-gnu/gnu
 27. else
 28_GNU_INCLUDE_DIR= /usr/include/gnu
 29. endif
 30. if exists(${_GNU_INCLUDE_DIR}/stubs-64.h) && \
 31 !exists(${_GNU_INCLUDE_DIR}/stubs-32.h)
27MULTILIB_SUPPORTED=No 32MULTILIB_SUPPORTED=No
28. else 33. else
29MULTILIB_SUPPORTED=Yes 34MULTILIB_SUPPORTED=Yes
30. endif 35. endif
31.endif 36.endif
32.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) 37.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
33PKG_SUPPORTED_OPTIONS+= gcc-multilib 38PKG_SUPPORTED_OPTIONS+= gcc-multilib
34PKG_SUGGESTED_OPTIONS+= gcc-multilib 39PKG_SUGGESTED_OPTIONS+= gcc-multilib
35.endif 40.endif
36 41
37.include "../../mk/bsd.options.mk" 42.include "../../mk/bsd.options.mk"
38 43
39### 44###