diff options
| author | rh <rh@pkgsrc.org> | 2002-10-16 03:14:41 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2002-10-16 03:14:41 +0000 |
| commit | 3a3e01d6babcad7c934306c4a7df1e60cd3832dc (patch) | |
| tree | ffe244b864cbb019cec06a2efb3339701a2172ac /devel/glib2 | |
| parent | c84b772520244c51c632284f3fa5f10e3d0914fa (diff) | |
| download | pkgsrc-3a3e01d6babcad7c934306c4a7df1e60cd3832dc.tar.gz | |
Switch glib2 from PTL2 to pth.
Introduce USE_PTL2 so that PTL2 can still be used as an alternative (e.g.
for debugging).
Only include ptl2/buildlink2.mk if USE_PTL2 is set and no native threads
are available.
Bump PKGREVISIONS.
Diffstat (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/Makefile | 9 | ||||
| -rw-r--r-- | devel/glib2/buildlink2.mk | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index f85d319f511..e24c2f2d783 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2002/09/11 11:31:40 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/10/16 03:14:41 rh Exp $ # DISTNAME= glib-2.0.6 PKGNAME= ${DISTNAME:S/glib/glib2/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \ @@ -26,8 +26,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -# GLib needs a working pre-emptive pthreads implementation +.include "../../mk/bsd.prefs.mk" + +.if defined(USE_PTL2) PTHREAD_OPTS+= native +.endif test: build cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \ diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk index 606f196a16b..aa89899b812 100644 --- a/devel/glib2/buildlink2.mk +++ b/devel/glib2/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.6 2002/09/23 02:28:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2002/10/16 03:14:41 rh Exp $ .if !defined(GLIB2_BUILDLINK2_MK) GLIB2_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= glib2 -BUILDLINK_DEPENDS.glib2?= glib2>=2.0.6nb1 +BUILDLINK_DEPENDS.glib2?= glib2>=2.0.6nb2 BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2 EVAL_PREFIX+= BUILDLINK_PREFIX.glib2=glib2 @@ -21,7 +21,11 @@ BUILDLINK_FILES.glib2+= lib/libgthread-2.0.* .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" +.include "../../mk/bsd.prefs.mk" + +.if defined(USE_PTL2) PTHREAD_OPTS+= native +.endif .include "../../mk/pthread.buildlink2.mk" |