Date: Thu, 23 Jan 2014 05:05:19 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340801 - in head: Mk math/octave-forge-ltfat math/octave-forge-nan math/octave-forge-tsa math/octave-forge-xraylib Message-ID: <201401230505.s0N55J6v055111@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Thu Jan 23 05:05:19 2014 New Revision: 340801 URL: http://svnweb.freebsd.org/changeset/ports/340801 QAT: https://qat.redports.org/buildarchive/r340801/ Log: - Move the MAKE_ARGS variables from some individual math/octave-forge-* ports to Mk/bsd.octave.mk. Also add LD_CXX="${CXX}" DL_LD="${CXX}" to MAKE_ARGS, as this fixes the build of several octave-forve-* ports by setting these variables properly in ${PREFIX}/bin/mkoctfile. Modified: head/Mk/bsd.octave.mk head/math/octave-forge-ltfat/Makefile head/math/octave-forge-nan/Makefile head/math/octave-forge-tsa/Makefile head/math/octave-forge-xraylib/Makefile Modified: head/Mk/bsd.octave.mk ============================================================================== --- head/Mk/bsd.octave.mk Thu Jan 23 04:26:38 2014 (r340800) +++ head/Mk/bsd.octave.mk Thu Jan 23 05:05:19 2014 (r340801) @@ -30,6 +30,7 @@ TARBALLS_DIR= ${LOCALBASE}/share/octave/ INSTALL_TARBALLS_DIR= ${STAGEDIR}${PREFIX}/share/octave/tarballs MAKE_ENV+= PACKAGE=${WRKDIR}/${DISTNAME}.tar.gz +MAKE_ARGS= CC="${CC}" CXX="${CXX}" LD_CXX="${CXX}" DL_LD="${CXX}" LOAD_OCTAVE_PKG_CMD= ${LOCALBASE}/libexec/octave/load-octave-pkg Modified: head/math/octave-forge-ltfat/Makefile ============================================================================== --- head/math/octave-forge-ltfat/Makefile Thu Jan 23 04:26:38 2014 (r340800) +++ head/math/octave-forge-ltfat/Makefile Thu Jan 23 05:05:19 2014 (r340801) @@ -15,8 +15,6 @@ LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw portaudio:${PORTSDIR}/audio/portaudio2 \ cblas:${PORTSDIR}/math/cblas -MAKE_ARGS= CC="${CC}" - # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${OCTAVE_PKGNAME} Modified: head/math/octave-forge-nan/Makefile ============================================================================== --- head/math/octave-forge-nan/Makefile Thu Jan 23 04:26:38 2014 (r340800) +++ head/math/octave-forge-nan/Makefile Thu Jan 23 05:05:19 2014 (r340801) @@ -11,7 +11,6 @@ COMMENT= Octave-forge package ${OCTAVE_P LICENSE= GPLv3 MAKE_JOBS_UNSAFE= yes -MAKE_ARGS= CC="${CC}" CXX="${CXX}" # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. Modified: head/math/octave-forge-tsa/Makefile ============================================================================== --- head/math/octave-forge-tsa/Makefile Thu Jan 23 04:26:38 2014 (r340800) +++ head/math/octave-forge-tsa/Makefile Thu Jan 23 05:05:19 2014 (r340801) @@ -10,8 +10,6 @@ COMMENT= Octave-forge package ${OCTAVE_P LICENSE= GPLv3 -MAKE_ARGS= CC="${CC}" CXX="${CXX}" - # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${OCTAVE_PKGNAME} Modified: head/math/octave-forge-xraylib/Makefile ============================================================================== --- head/math/octave-forge-xraylib/Makefile Thu Jan 23 04:26:38 2014 (r340800) +++ head/math/octave-forge-xraylib/Makefile Thu Jan 23 05:05:19 2014 (r340801) @@ -12,7 +12,6 @@ COMMENT= Octave-forge package ${OCTAVE_P LICENSE= GPLv2 GNU_CONFIGURE= yes -MAKE_ARGS= CC="${CC}" BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401230505.s0N55J6v055111>