From 1b9aee41b95f2a54f68bfc19c95a47a679879352 Mon Sep 17 00:00:00 2001 From: ben Date: Mon, 4 Sep 2006 14:17:51 +0000 Subject: Fix the csound5 install phase. At some point, pkgsrc started setting a different MAKE_ENV in the install phase than in the build phase. This caused scons to report that "the build action changed", which caused scons to rebuild csound5 and install it with a broken configuration. This hack saves MAKE_ENV to a file in WRKDIR, then uses that file to set the environment in the install phase. --- audio/csound5/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile index f895999fa47..6d697b8ec3c 100644 --- a/audio/csound5/Makefile +++ b/audio/csound5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/05/21 22:46:22 ben Exp $ +# $NetBSD: Makefile,v 1.2 2006/09/04 14:17:51 ben Exp $ # DISTNAME= Csound${CSOUND_VERSION}_src @@ -21,12 +21,15 @@ SCONS_ARGS= -C ${WRKSRC} prefix=${PREFIX} SCONS_ARGS+= buildDSSI=0 buildLoris=0 buildRelease=1 SCONS_ARGS+= useALSA=0 useJack=0 useOSC=0 usePortMIDI=0 SCONS_ARGS+= usePortAudio=0 +SCONS_ENV_FILE= ${WRKDIR}/ugly-pkgsrc-scons-hack.txt do-build: + ${ECHO} ${MAKE_ENV:Q} >${SCONS_ENV_FILE} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS} do-install: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS} install + cd ${WRKSRC} && SCONS_ENV="`${CAT} ${SCONS_ENV_FILE}`" && \ + eval "${SETENV} $${SCONS_ENV} ${SCONS} ${SCONS_ARGS} install" cd ${PREFIX} && ${LN} -s ../lib/csound5/csound bin/csound5 .include "../../audio/fluidsynth/buildlink3.mk" -- cgit v1.2.3