summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2004-07-09 20:11:36 +0000
committerdrochner <drochner@pkgsrc.org>2004-07-09 20:11:36 +0000
commitb68866ae61f26de1e57457bd4974e26f48be681d (patch)
tree8297d9293073da635639b847ee3931f1e6faaaac /lang
parent64082968740fc48544708d1a90d93c72901f362a (diff)
downloadpkgsrc-b68866ae61f26de1e57457bd4974e26f48be681d.tar.gz
oops - have to order the includes / tests a bit differently to avoid
an unwanted dependency on pth on 1.6.x
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc34/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index cc4fbcbd870..79e0bab9ad2 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/09 19:25:12 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/09 20:11:36 drochner Exp $
#
DISTNAME= gcc-${GCC_VERSION}-${GCC_VERSION_DATE}
@@ -53,7 +53,13 @@ CONFIGURE_ARGS+= --without-included-gettext
CONFIGURE_ARGS+= --enable-long-long
CONFIGURE_ARGS+= --enable-clocale=generic
# GNU pth is useless here
+.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
+# ADA tasking strictly requires native threads
+PTHREAD_OPTS= require native
+.else
PTHREAD_OPTS= native
+.endif
+.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native"
CONFIGURE_ARGS+= --disable-threads
.endif
@@ -68,9 +74,6 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
-# ADA tasking strictly requires native threads
-PTHREAD_OPTS= require native
-
# Ada bootstrap compiler section
# An Ada compiler is required to build the Ada compiler. Two
may be used:
@@ -191,7 +194,6 @@ BUILDLINK_DEPMETHOD.gcc3-ada=build
.include "../../lang/gcc34-ada/buildlink3.mk"
. endif
.endif
-.include "../../mk/pthread.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"