diff options
| author | jlam <jlam> | 2002-08-01 14:28:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-01 14:28:10 +0000 |
| commit | e73ea660a54a4c62d0c9397aba38119961fc1f25 (patch) | |
| tree | b75d9255700f035a018782bc125efe2a0205fb6e /www | |
| parent | 0c20853f1d863bc3bf2aa6177f3a142998c5b541 (diff) | |
| download | pkgsrc-e73ea660a54a4c62d0c9397aba38119961fc1f25.tar.gz | |
Fix so that mozilla doesn't require a native pthread library. "require"
comes from devel/glib/buildlink. devel/glib requires a pthread library but
www/mozilla optionally wants a native pthread library. Checking for
PTHREAD_TYPE != "native" will work, but we may want to consider expanding
the capabilities of pthread.buildlink.mk to cover this scenario.
Diffstat (limited to 'www')
| -rw-r--r-- | www/mozilla/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 2858443631f..7dd6510ebff 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2002/08/01 06:40:55 jlam Exp $ +# $NetBSD: Makefile,v 1.95 2002/08/01 14:28:10 jlam Exp $ MOZ_VER= 1.0 DISTNAME= mozilla-source-${MOZ_VER} @@ -67,8 +67,6 @@ SCRIPTS_ENV+= BINGRP=${BINGRP} SCRIPTS_ENV+= BINMODE=${BINMODE} SCRIPTS_ENV+= SETENV=${SETENV} -PTHREAD_OPTS+= native - .if ${MACHINE_ARCH} == "m68k" DBG= .else @@ -95,7 +93,12 @@ do-install: .include "../../mk/pthread.buildlink.mk" -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") +# 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") CONFIGURE_ARGS+= --without-pthreads .endif |