[pkgsrc/trunk]: pkgsrc/lang/gcc34 oops - have to order the includes / tests a...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d7c97e4542b
branches:  trunk
changeset: 477815:7d7c97e4542b
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jul 09 20:11:36 2004 +0000

description:
oops - have to order the includes / tests a bit differently to avoid
an unwanted dependency on pth on 1.6.x

diffstat:

 lang/gcc34/Makefile |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 357742f23080 -r 7d7c97e4542b lang/gcc34/Makefile
--- a/lang/gcc34/Makefile       Fri Jul 09 19:25:12 2004 +0000
+++ b/lang/gcc34/Makefile       Fri Jul 09 20:11:36 2004 +0000
@@ -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+=       --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 @@
 
 .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 @@
 .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"