diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-01 05:48:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-01 05:48:00 +0000 |
| commit | 75e61cb884ee8ba12235cd6a05a62b1c25c5fba7 (patch) | |
| tree | ddb090c3c0b454f9c8402f5b1724832e17cddad6 /devel/glib | |
| parent | 74efb51f8c38659285bc7369ad4bc06ca807eb44 (diff) | |
| download | pkgsrc-75e61cb884ee8ba12235cd6a05a62b1c25c5fba7.tar.gz | |
Adjust to new pthread.buildlink.mk: remove USE_PTHREAD and replace with
appropriate PTHREAD_OPTS incantation, and move the checks for the value
of PTHREAD_TYPE below the inclusion of pthread.buildlink.mk.
Diffstat (limited to 'devel/glib')
| -rw-r--r-- | devel/glib/Makefile | 7 | ||||
| -rw-r--r-- | devel/glib/buildlink.mk | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 80a6c41d101..043f3f59213 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2002/07/18 02:19:30 rh Exp $ +# $NetBSD: Makefile,v 1.47 2002/08/01 05:48:07 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -30,10 +30,7 @@ TEXINFO_OVERRIDE= YES CFLAGS= -O0 .endif -# GLib needs a working pthreads implementation, and pth is proven to work. -USE_PTHREAD= native pth - -.include "../../mk/bsd.prefs.mk" +PTHREAD_OPTS+= require GLIB_VERSION= ${DISTNAME:S/glib-//} GLIB_MAJOR_VERSION= ${GLIB_VERSION:C/\..*//} diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk index 8bd6f54f0d5..a07322c99f5 100644 --- a/devel/glib/buildlink.mk +++ b/devel/glib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.16 2002/06/12 00:48:20 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.17 2002/08/01 05:48:08 jlam Exp $ # # This Makefile fragment is included by packages that use glib. # @@ -29,9 +29,8 @@ BUILDLINK_FILES.glib+= lib/libglib.* BUILDLINK_FILES.glib+= lib/libgmodule.* BUILDLINK_FILES.glib+= lib/libgthread.* -USE_PTHREAD= native pth +PTHREAD_OPTS+= require -.include "../../mk/bsd.prefs.mk" .include "../../mk/pthread.buildlink.mk" BUILDLINK_TARGETS.glib= glib-buildlink |