diff options
| author | wiz <wiz> | 2002-09-12 22:52:34 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-09-12 22:52:34 +0000 |
| commit | eee4a6a694bf670e6c97ffdf02f08450dfc7a45a (patch) | |
| tree | ec82f023ef03286126aa330e462f084a96f3362d | |
| parent | 9afcb8b8996b16bb3d9ebcd3c8d522085b6ffd8f (diff) | |
| download | pkgsrc-eee4a6a694bf670e6c97ffdf02f08450dfc7a45a.tar.gz | |
Pullup v1.34, requested by agc, tested by hubertf:
Fix the "MAKEOBJDIRPREFIX being set causes problems" in a different way.
Explicitly add "USETOOLS=no" to the MAKE_ENV.
Overload the SETENV definition to unset MAKEOBJDIRPREFIX properly.
| -rw-r--r-- | devel/unproven-pthreads/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile index 7abdf0d11ac..b1e691b62ab 100644 --- a/devel/unproven-pthreads/Makefile +++ b/devel/unproven-pthreads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2002/08/16 20:15:30 jdolecek Exp $ +# $NetBSD: Makefile,v 1.32.4.1 2002/09/12 22:52:34 wiz Exp $ # DISTNAME= unproven-pthreads-0.17 @@ -15,24 +15,17 @@ CONFLICTS+= mit-pthreads-[0-9]* GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${PREFIX}/pthreads -MAKE_ENV+= NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} +MAKE_ENV+= NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} USETOOLS=no CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config/config.guess CONFIG_SUB_OVERRIDE= ${WRKSRC}/config/config.sub -# build makes some assumptions about OBJDIR, avoid confusing it -do-build: - unset MAKEOBJDIRPREFIX; cd ${WRKSRC} && ${MAKE} - post-extract: @${RM} ${WRKSRC}/include/pthread/unistd.h pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/pthreads -do-install: - unset MAKEOBJDIRPREFIX; cd ${WRKSRC} && ${MAKE} install - post-install: @${RM} -f ${PREFIX}/pthreads/lib/libpthread_pic.a @${FIND} ${PREFIX}/pthreads/include -name '*.orig' | ${XARGS} ${RM} @@ -41,3 +34,5 @@ post-install: @${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/pthreads/include .include "../../mk/bsd.pkg.mk" + +SETENV:= unset MAKEOBJDIRPREFIX; ${SETENV} |