summaryrefslogtreecommitdiff
path: root/lang/gcc-aux
diff options
context:
space:
mode:
authormarino <marino@pkgsrc.org>2014-05-15 09:50:44 +0000
committermarino <marino@pkgsrc.org>2014-05-15 09:50:44 +0000
commit77012783055d2d40c4ee5f41be4ad82301c1b62c (patch)
treec7e9ab119c3763a0ebf8043a10f27d6de6e5a621 /lang/gcc-aux
parentf3b4b931f5c4e5cce97a9871d4d14b6595acee31 (diff)
downloadpkgsrc-77012783055d2d40c4ee5f41be4ad82301c1b62c.tar.gz
lang/gcc-aux: Save work on OpenBSD - work suspended
gcc-aux builds on OpenBSD, but the default posix thread handling for Ada tasking no longer works. All tasks get stuck in a "Thread Sleep" sleep state. The gcc4.8.2-based egcc in OpenBSD ports supports Ada and passes all tests. There is no difference in the configuration between that and gcc-aux. To fix, it probably requires tasking support unique to OpenBSD and that's out of scope for me at the moment, especially considering the lack of a suitable development machine. As such, I'm suspending my work on OpenBSD. This commit captures some minor bug fixes. The addition of "--enable-checking" configuration switch should be the default so there's no need bump gcc-aux again.
Diffstat (limited to 'lang/gcc-aux')
-rw-r--r--lang/gcc-aux/Makefile19
1 files changed, 12 insertions, 7 deletions
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index e9b3c081374..2792d073987 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/05/13 08:18:04 marino Exp $
+# $NetBSD: Makefile,v 1.20 2014/05/15 09:50:44 marino Exp $
#
PKGNAME= gcc-aux-${SNAPSHOT}
@@ -87,6 +87,9 @@ NATIVE_LINKER!= which ld
OPENMIR= yes
MODERN_BINUTILS= yes
EXTRA_CONFARGS+= --disable-libstdcxx-pch
+EXTRA_CONFARGS+= --disable-tls
+EXTRA_CONFARGS+= --enable-cpp
+EXTRA_CONFARGS+= --enable-wchar_t
BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.openbsd.55.tar.bz2
.endif
@@ -181,6 +184,7 @@ CONFIGURE_ARGS= --enable-languages=${LANGS:Q}
CONFIGURE_ARGS+= --build=${BLD_TARGET}
CONFIGURE_ARGS+= --prefix=${PKG_PREFIX:Q}
CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+= --enable-checking=release
CONFIGURE_ARGS+= --disable-libmudflap
CONFIGURE_ARGS+= --disable-libgomp
CONFIGURE_ARGS+= --disable-libssp
@@ -226,14 +230,14 @@ post-extract:
. for sl in c m z util pthread
${LN} -s `ls /usr/lib/lib${sl}.so* | head -1` ${SYSLIBDIR}/lib${sl}.so
. endfor
- ${PERL5} -i -pe 's|\$$\(MISCLIB\)|-L${SYSLIBDIR} \$$(MISCLIB)|g;' \
+ ${PERL5} -i.bak -pe 's|\$$\(MISCLIB\)|-L${SYSLIBDIR} \$$(MISCLIB)|g;' \
-pe 's|\$$\(THREADSLIB\)|-L${SYSLIBDIR} \$$(THREADSLIB)|g' \
${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
- ${PERL5} -i -pe 's|-lpthread|-L${SYSLIBDIR} -lpthread|g;' \
- -pe 's|@XCFLAGS@|-L${SYSLIBDIR} @XCFLAGS@|g;' \
- -pe 's|-lm|-L${SYSLIBDIR} -lm|g' \
+ ${PERL5} -i.bak -pe 's|-lm|-L${SYSLIBDIR} -lm|g' \
${WRKSRC}/libquadmath/Makefile.in \
- ${WRKSRC}/libgfortran/Makefile.in \
+ ${WRKSRC}/libgfortran/Makefile.in
+ ${PERL5} -i.bak -pe 's|-lpthread|-L${SYSLIBDIR} -lpthread|g;' \
+ -pe 's|\@XCFLAGS\@|-L${SYSLIBDIR} \@XCFLAGS\@|g;' \
${WRKSRC}/libcilkrts/Makefile.in \
${WRKSRC}/libitm/Makefile.in
. endif
@@ -293,7 +297,8 @@ test-ada:
${ULIMIT_CMD_stacksize} && \
${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-ada
.else
- cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-ada
+ cd ${BUILDDIR} && ${SETENV} ${MY_MAKE_ENV} DEJAGNU_TIMEOUT=30 \
+ ${GMAKE} -sk check-ada
.endif
test-fortran: