diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-02 05:40:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-02 05:40:48 +0000 |
| commit | 6ef4d03e59c0fff11805c2fb7f525a1875912b54 (patch) | |
| tree | e3c32fbf20486f2bc52e862edb0fd33253a28f0e /www | |
| parent | 3b6db329d01f8f76fd941afb6af594aed6158429 (diff) | |
| download | pkgsrc-6ef4d03e59c0fff11805c2fb7f525a1875912b54.tar.gz | |
Do away with special pthread.buildlink.mk hack and add "optional" to
PTHREAD_OPTS. This allows us to ignore the "require" inherited from the
glib/buildlink.mk file, which was originally causing "require native" to
be used for mozilla and was causing build problems on platforms without
native pthreads.
Diffstat (limited to 'www')
| -rw-r--r-- | www/mozilla/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 7dd6510ebff..f72c2a266d3 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2002/08/01 14:28:10 jlam Exp $ +# $NetBSD: Makefile,v 1.96 2002/08/02 05:40:48 jlam Exp $ MOZ_VER= 1.0 DISTNAME= mozilla-source-${MOZ_VER} @@ -67,6 +67,8 @@ SCRIPTS_ENV+= BINGRP=${BINGRP} SCRIPTS_ENV+= BINMODE=${BINMODE} SCRIPTS_ENV+= SETENV=${SETENV} +PTHREAD_OPTS+= native optional + .if ${MACHINE_ARCH} == "m68k" DBG= .else @@ -93,12 +95,7 @@ do-install: .include "../../mk/pthread.buildlink.mk" -# This check isn't strictly correct. devel/glib requires a pthread library -# but www/mozilla optionally wants a native pthread library. The following -# will work, but we may want to consider expanding the capabilities of -# pthread.buildlink.mk to cover this scenario. -# -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "native") +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") CONFIGURE_ARGS+= --without-pthreads .endif |