pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/csound5 Fix the csound5 install phase.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/541431bae2e7
branches:  trunk
changeset: 518256:541431bae2e7
user:      ben <ben%pkgsrc.org@localhost>
date:      Mon Sep 04 14:17:51 2006 +0000

description:
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.

diffstat:

 audio/csound5/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 4e1af74c9867 -r 541431bae2e7 audio/csound5/Makefile
--- a/audio/csound5/Makefile    Mon Sep 04 13:29:07 2006 +0000
+++ b/audio/csound5/Makefile    Mon Sep 04 14:17:51 2006 +0000
@@ -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+=           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"



Home | Main Index | Thread Index | Old Index