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/glib2 | |
| 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/glib2')
| -rw-r--r-- | devel/glib2/Makefile | 11 | ||||
| -rw-r--r-- | devel/glib2/buildlink.mk | 13 |
2 files changed, 16 insertions, 8 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index df3f79e007d..9b912cdf2bb 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/06/30 16:26:45 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/01 05:48:08 jlam Exp $ # DISTNAME= glib-2.0.4 @@ -22,11 +22,10 @@ USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PERL5= yes CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib -CPPFLAGS+= -I${BUILDLINK_DIR}/PTL/include MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" # GLib needs a working pre-emptive pthreads implementation -USE_PTHREAD= native ptl2 +PTHREAD_OPTS+= native test: build cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \ @@ -36,4 +35,10 @@ test: build .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/pkgconfig/buildlink.mk" .include "../../mk/pthread.buildlink.mk" + +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") +CPPFLAGS+= -I${BUILDLINK_DIR}/PTL/include +. include "../../devel/ptl2/buildlink.mk" +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/devel/glib2/buildlink.mk b/devel/glib2/buildlink.mk index 9515bb01d86..00daedfb02b 100644 --- a/devel/glib2/buildlink.mk +++ b/devel/glib2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2002/05/10 01:17:28 rh Exp $ +# $NetBSD: buildlink.mk,v 1.4 2002/08/01 05:48:08 jlam Exp $ # # This Makefile fragment is included by packages that use glib2. # @@ -30,13 +30,18 @@ BUILDLINK_FILES.glib2+= lib/libgmodule-2.0.* BUILDLINK_FILES.glib2+= lib/libgobject-2.0.* BUILDLINK_FILES.glib2+= lib/libgthread-2.0.* +.include "../../converters/libiconv/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/pkgconfig/buildlink.mk" -USE_PTHREAD= native ptl2 +PTHREAD_OPTS+= native -.include "../../mk/bsd.prefs.mk" .include "../../mk/pthread.buildlink.mk" +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") +. include "../../devel/ptl2/buildlink.mk" +.endif + BUILDLINK_TARGETS.glib2= glib2-buildlink BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.glib2} BUILDLINK_TARGETS+= ${BUILDLINK_PKG_CONFIG} @@ -44,6 +49,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_PKG_CONFIG} pre-configure: ${BUILDLINK_TARGETS} glib2-buildlink: _BUILDLINK_USE -.include "../../converters/libiconv/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" .endif # GLIB2_BUILDLINK_MK |