Wed Sep 28 12:07:27 2016 UTC ()
lang/gcc47: don't build gcc-java by default on NetBSD
it fails at configure as an unsupported language for powerpc, and is not
too useful.

not bumping pkgrevision as requested  - it shouldn't matter to anyone who
already has the package, even on netbsd, and avoids an expensive rebuild.


(maya)
diff -r1.12 -r1.13 pkgsrc/lang/gcc47/options.mk
cvs diff -r1.12 -r1.13 pkgsrc/lang/gcc47/Attic/options.mk (switch to unified diff)

--- pkgsrc/lang/gcc47/Attic/options.mk 2016/02/25 14:42:56 1.12
+++ pkgsrc/lang/gcc47/Attic/options.mk 2016/09/28 12:07:27 1.13
@@ -1,167 +1,167 @@ @@ -1,167 +1,167 @@
1# $NetBSD: options.mk,v 1.12 2016/02/25 14:42:56 jperkin Exp $ 1# $NetBSD: options.mk,v 1.13 2016/09/28 12:07:27 maya 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 gcc-java \ 4PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
5 gcc-go gcc-objc gcc-objc++ 5 gcc-go gcc-objc gcc-objc++
6PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ 6PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++
7 7
8PKG_SUGGESTED_OPTIONS.DragonFly+= nls 8PKG_SUGGESTED_OPTIONS.DragonFly+= nls
9PKG_SUGGESTED_OPTIONS.Linux+= nls gcc-java 9PKG_SUGGESTED_OPTIONS.Linux+= nls gcc-java
10PKG_SUGGESTED_OPTIONS.NetBSD+= nls gcc-java 10PKG_SUGGESTED_OPTIONS.NetBSD+= nls
11PKG_SUGGESTED_OPTIONS.SunOS+= gcc-go gcc-inplace-math 11PKG_SUGGESTED_OPTIONS.SunOS+= gcc-go gcc-inplace-math
12PKG_SUGGESTED_OPTIONS.*+= gcc-java 12PKG_SUGGESTED_OPTIONS.*+= gcc-java
13 13
14### 14###
15### Determine if multilib is avalible. 15### Determine if multilib is avalible.
16### 16###
17MULTILIB_SUPPORTED?= unknown 17MULTILIB_SUPPORTED?= unknown
18.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 18.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
19. if exists(/usr/include/gnu/stubs-64.h) && \ 19. if exists(/usr/include/gnu/stubs-64.h) && \
20 !exists(/usr/include/gnu/stubs-32.h) 20 !exists(/usr/include/gnu/stubs-32.h)
21MULTILIB_SUPPORTED=No 21MULTILIB_SUPPORTED=No
22. else 22. else
23MULTILIB_SUPPORTED=Yes 23MULTILIB_SUPPORTED=Yes
24. endif 24. endif
25.endif 25.endif
26.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) 26.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
27PKG_SUPPORTED_OPTIONS+= gcc-multilib 27PKG_SUPPORTED_OPTIONS+= gcc-multilib
28PKG_SUGGESTED_OPTIONS+= gcc-multilib 28PKG_SUGGESTED_OPTIONS+= gcc-multilib
29.endif 29.endif
30 30
31.include "../../mk/bsd.options.mk" 31.include "../../mk/bsd.options.mk"
32 32
33### 33###
34### Native Language Support 34### Native Language Support
35### 35###
36.if !empty(PKG_OPTIONS:Mnls) 36.if !empty(PKG_OPTIONS:Mnls)
37USE_TOOLS+= msgfmt 37USE_TOOLS+= msgfmt
38CONFIGURE_ARGS+= --enable-nls 38CONFIGURE_ARGS+= --enable-nls
39CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} 39CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
40MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} 40MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
41.include "../../converters/libiconv/buildlink3.mk" 41.include "../../converters/libiconv/buildlink3.mk"
42.include "../../devel/gettext-lib/buildlink3.mk" 42.include "../../devel/gettext-lib/buildlink3.mk"
43.else 43.else
44CONFIGURE_ARGS+= --disable-nls 44CONFIGURE_ARGS+= --disable-nls
45.endif 45.endif
46 46
47### 47###
48### Multilib Support 48### Multilib Support
49### 49###
50.if (!empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) && \ 50.if (!empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss]) && \
51 empty(PKG_OPTIONS:Mgcc-multilib) ) || \ 51 empty(PKG_OPTIONS:Mgcc-multilib) ) || \
52 !empty(MULTILIB_SUPPORTED:M[Nn][Oo]) 52 !empty(MULTILIB_SUPPORTED:M[Nn][Oo])
53CONFIGURE_ARGS+= --disable-multilib 53CONFIGURE_ARGS+= --disable-multilib
54.endif 54.endif
55 55
56### 56###
57### Build math libraries in place 57### Build math libraries in place
58### 58###
59.if !empty(PKG_OPTIONS:Mgcc-inplace-math) 59.if !empty(PKG_OPTIONS:Mgcc-inplace-math)
60. include "../../devel/gmp/inplace.mk" 60. include "../../devel/gmp/inplace.mk"
61. include "../../math/mpcomplex/inplace.mk" 61. include "../../math/mpcomplex/inplace.mk"
62. include "../../math/mpfr/inplace.mk" 62. include "../../math/mpfr/inplace.mk"
63.else 63.else
64CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} 64CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
65CONFIGURE_ARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex} 65CONFIGURE_ARGS+= --with-mpc=${BUILDLINK_PREFIX.mpcomplex}
66CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr} 66CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
67LIBS.SunOS+= -lgmp 67LIBS.SunOS+= -lgmp
68. include "../../devel/gmp/buildlink3.mk" 68. include "../../devel/gmp/buildlink3.mk"
69. include "../../math/mpcomplex/buildlink3.mk" 69. include "../../math/mpcomplex/buildlink3.mk"
70. include "../../math/mpfr/buildlink3.mk" 70. include "../../math/mpfr/buildlink3.mk"
71.endif 71.endif
72 72
73### 73###
74### Optional languages 74### Optional languages
75### Ada could be added although there is a bootstrapping issue. See 75### Ada could be added although there is a bootstrapping issue. See
76### ../gcc34-ada for guidance 76### ../gcc34-ada for guidance
77### 77###
78 78
79.if !empty(PKG_OPTIONS:Mgcc-objc++) 79.if !empty(PKG_OPTIONS:Mgcc-objc++)
80. if empty(PKG_OPTIONS:Mgcc-c++) 80. if empty(PKG_OPTIONS:Mgcc-c++)
81PKG_OPTIONS+= gcc-c++ 81PKG_OPTIONS+= gcc-c++
82. endif 82. endif
83. if empty(PKG_OPTIONS:Mgcc-objc) 83. if empty(PKG_OPTIONS:Mgcc-objc)
84PKG_OPTIONS+= gcc-objc 84PKG_OPTIONS+= gcc-objc
85. endif 85. endif
86LANGS+= obj-c++ 86LANGS+= obj-c++
87.endif 87.endif
88 88
89.if !empty(PKG_OPTIONS:Mgcc-objc) 89.if !empty(PKG_OPTIONS:Mgcc-objc)
90LANGS+= objc 90LANGS+= objc
91.endif 91.endif
92 92
93.if !empty(PKG_OPTIONS:Mgcc-java) 93.if !empty(PKG_OPTIONS:Mgcc-java)
94. if empty(PKG_OPTIONS:Mgcc-c++) 94. if empty(PKG_OPTIONS:Mgcc-c++)
95PKG_OPTIONS+= gcc-c++ 95PKG_OPTIONS+= gcc-c++
96. endif 96. endif
97 97
98LANGS+= java 98LANGS+= java
99 99
100# Add the Eclipse Java compiler for to parse `.java' source files. 100# Add the Eclipse Java compiler for to parse `.java' source files.
101ECJ_JAR= ecj-4.5.jar 101ECJ_JAR= ecj-4.5.jar
102SITES.${ECJ_JAR}= ftp://sourceware.org/pub/java/ 102SITES.${ECJ_JAR}= ftp://sourceware.org/pub/java/
103DISTFILES+= ${ECJ_JAR} 103DISTFILES+= ${ECJ_JAR}
104CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q} 104CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q}
105 105
106JAVA_NAME= ${GCC_PKGNAME} 106JAVA_NAME= ${GCC_PKGNAME}
107JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} 107JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
108JAVA_WRAPPERS= appletviewer jar jarsigner java javah keytool \ 108JAVA_WRAPPERS= appletviewer jar jarsigner java javah keytool \
109 native2ascii orbd rmic rmid rmiregistry serialver \ 109 native2ascii orbd rmic rmid rmiregistry serialver \
110 tnameserv 110 tnameserv
111 111
112JAVA_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/} 112JAVA_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/}
113 113
114PLIST_SRC+= PLIST.java 114PLIST_SRC+= PLIST.java
115PLIST_SUBST+= JAVA_NAME=${JAVA_NAME:Q} 115PLIST_SUBST+= JAVA_NAME=${JAVA_NAME:Q}
116PLIST_SUBST+= JAVA_ARCH=${JAVA_ARCH:Q} 116PLIST_SUBST+= JAVA_ARCH=${JAVA_ARCH:Q}
117 117
118# Create a JPackage compatible SDK environment. 118# Create a JPackage compatible SDK environment.
119CONFIGURE_ARGS+= --enable-java-home 119CONFIGURE_ARGS+= --enable-java-home
120CONFIGURE_ARGS+= --with-os-directory=${LOWER_OPSYS:Q} 120CONFIGURE_ARGS+= --with-os-directory=${LOWER_OPSYS:Q}
121CONFIGURE_ARGS+= --with-arch-directory=${JAVA_ARCH:Q} 121CONFIGURE_ARGS+= --with-arch-directory=${JAVA_ARCH:Q}
122CONFIGURE_ARGS+= --with-jvm-root-dir=${JAVA_HOME:Q} 122CONFIGURE_ARGS+= --with-jvm-root-dir=${JAVA_HOME:Q}
123CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q} 123CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q}
124 124
125REPLACE_PYTHON= libjava/contrib/aot-compile.in 125REPLACE_PYTHON= libjava/contrib/aot-compile.in
126 126
127USE_TOOLS+= unzip zip:run gmake:run 127USE_TOOLS+= unzip zip:run gmake:run
128CONFIGURE_ARGS+= --with-system-zlib 128CONFIGURE_ARGS+= --with-system-zlib
129 129
130# libjava/contrib/aotcompile.py.in stores the path to a 'make' program so 130# libjava/contrib/aotcompile.py.in stores the path to a 'make' program so
131# we need to make sure we give it the installed 'make' and not the tool 131# we need to make sure we give it the installed 'make' and not the tool
132# wrapped one. 132# wrapped one.
133CONFIGURE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake} 133CONFIGURE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake}
134MAKE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake} 134MAKE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake}
135 135
136# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build 136# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build
137# failure (seen on NetBSD-5.0/i386) when building java. So in case 137# failure (seen on NetBSD-5.0/i386) when building java. So in case
138# the fastjar package is installed, make sure the configure script 138# the fastjar package is installed, make sure the configure script
139# doesn't pick it up. 139# doesn't pick it up.
140CONFIGURE_ENV+= JAR=no 140CONFIGURE_ENV+= JAR=no
141MAKE_ENV+= JAR=no 141MAKE_ENV+= JAR=no
142MAKE_ENV+= ac_cv_prog_JAR=no 142MAKE_ENV+= ac_cv_prog_JAR=no
143 143
144.include "../../devel/zlib/buildlink3.mk" 144.include "../../devel/zlib/buildlink3.mk"
145.include "../../lang/python/application.mk" 145.include "../../lang/python/application.mk"
146.include "../../mk/java-env.mk" 146.include "../../mk/java-env.mk"
147.endif 147.endif
148 148
149.if !empty(PKG_OPTIONS:Mgcc-go) 149.if !empty(PKG_OPTIONS:Mgcc-go)
150LANGS+= go 150LANGS+= go
151.endif 151.endif
152 152
153.if !empty(PKG_OPTIONS:Mgcc-fortran) 153.if !empty(PKG_OPTIONS:Mgcc-fortran)
154LANGS+= fortran 154LANGS+= fortran
155.endif 155.endif
156 156
157.if !empty(PKG_OPTIONS:Mgcc-c++) 157.if !empty(PKG_OPTIONS:Mgcc-c++)
158LANGS+= c++ 158LANGS+= c++
159USE_TOOLS+= perl 159USE_TOOLS+= perl
160.if ${OPSYS} != "SunOS" 160.if ${OPSYS} != "SunOS"
161CONFIGURE_ARGS+= --enable-__cxa_atexit 161CONFIGURE_ARGS+= --enable-__cxa_atexit
162.endif 162.endif
163CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/ 163CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/
164.else 164.else
165CONFIGURE_ARGS+= --disable-build-with-cxx 165CONFIGURE_ARGS+= --disable-build-with-cxx
166CONFIGURE_ARGS+= --disable-build-poststage1-with-cxx 166CONFIGURE_ARGS+= --disable-build-poststage1-with-cxx
167.endif 167.endif