Tue Feb 25 21:24:51 2014 UTC ()
Add untested code for checking multilib-support, based on the gcc47
version of the same.


(wiz)
diff -r1.8 -r1.9 pkgsrc/lang/gcc46/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/lang/gcc46/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc46/Attic/options.mk 2012/04/13 11:02:47 1.8
+++ pkgsrc/lang/gcc46/Attic/options.mk 2014/02/25 21:24:51 1.9
@@ -1,29 +1,46 @@ @@ -1,29 +1,46 @@
1# $NetBSD: options.mk,v 1.8 2012/04/13 11:02:47 hans Exp $ 1# $NetBSD: options.mk,v 1.9 2014/02/25 21:24:51 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc46 3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc46
4PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada 4PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
5PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc 5PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc
6.if ${OPSYS} == "NetBSD" 6.if ${OPSYS} == "NetBSD"
7PKG_SUGGESTED_OPTIONS+= nls 7PKG_SUGGESTED_OPTIONS+= nls
8.elif ${OPSYS} == "SunOS" 8.elif ${OPSYS} == "SunOS"
9PKG_SUGGESTED_OPTIONS+= gcc-inplace-math 9PKG_SUGGESTED_OPTIONS+= gcc-inplace-math
10.endif 10.endif
11 11
12PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-c++ 12PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-c++
13PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran 13PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran
14PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java 14PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java
15PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc 15PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc
16 16
 17###
 18### Determine if multilib is avalible.
 19###
 20MULTILIB_SUPPORTED?= unknown
 21.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
 22. if exists(/usr/include/gnu/stubs-64.h) && \
 23 !exists(/usr/include/gnu/stubs-32.h)
 24MULTILIB_SUPPORTED=No
 25. else
 26MULTILIB_SUPPORTED=Yes
 27. endif
 28.endif
 29.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
 30PKG_SUPPORTED_OPTIONS+= gcc-multilib
 31PKG_SUGGESTED_OPTIONS+= gcc-multilib
 32.endif
 33
17.include "../../mk/bsd.options.mk" 34.include "../../mk/bsd.options.mk"
18 35
19### 36###
20### Build math libraries in place 37### Build math libraries in place
21### 38###
22.if !empty(PKG_OPTIONS:Mgcc-inplace-math) 39.if !empty(PKG_OPTIONS:Mgcc-inplace-math)
23.include "../../devel/gmp/inplace.mk" 40.include "../../devel/gmp/inplace.mk"
24.include "../../math/mpcomplex/inplace.mk" 41.include "../../math/mpcomplex/inplace.mk"
25.include "../../math/mpfr/inplace.mk" 42.include "../../math/mpfr/inplace.mk"
26.else 43.else
27CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} 44CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
28CONFIGURE_ARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex} 45CONFIGURE_ARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex}
29CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr} 46CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
@@ -38,26 +55,35 @@ LIBS.SunOS+= -lgmp @@ -38,26 +55,35 @@ LIBS.SunOS+= -lgmp
38### 55###
39.if !empty(PKG_OPTIONS:Mnls) 56.if !empty(PKG_OPTIONS:Mnls)
40USE_TOOLS+= msgfmt 57USE_TOOLS+= msgfmt
41CONFIGURE_ARGS+= --enable-nls 58CONFIGURE_ARGS+= --enable-nls
42CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv} 59CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv}
43MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} 60MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
44.include "../../converters/libiconv/buildlink3.mk" 61.include "../../converters/libiconv/buildlink3.mk"
45.include "../../devel/gettext-lib/buildlink3.mk" 62.include "../../devel/gettext-lib/buildlink3.mk"
46.else 63.else
47CONFIGURE_ARGS+= --disable-nls 64CONFIGURE_ARGS+= --disable-nls
48.endif 65.endif
49 66
50### 67###
 68### Multilib Support
 69###
 70.if (!empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) && \
 71 empty(PKG_OPTIONS:Mgcc-multilib) ) || \
 72 !empty(MULTILIB_SUPPORTED:M[Nn][Oo])
 73CONFIGURE_ARGS+= --disable-multilib
 74.endif
 75
 76###
51### Optional languages 77### Optional languages
52### Ada could be added although there is a bootstrapping issue. See 78### Ada could be added although there is a bootstrapping issue. See
53### ../gcc34-ada for guidance 79### ../gcc34-ada for guidance
54### 80###
55 81
56LANGS= c 82LANGS= c
57 83
58.if !empty(PKG_OPTIONS:Mgcc-java) 84.if !empty(PKG_OPTIONS:Mgcc-java)
59. if empty(PKG_OPTIONS:Mgcc-c++) 85. if empty(PKG_OPTIONS:Mgcc-c++)
60PKG_OPTIONS+= gcc-c++ 86PKG_OPTIONS+= gcc-c++
61. endif 87. endif
62 88
63LANGS+= java 89LANGS+= java