Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Jan 2015 18:52:26 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377692 - in head: Mk/Uses audio/csound
Message-ID:  <201501221852.t0MIqQpx047751@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Jan 22 18:52:26 2015
New Revision: 377692
URL: https://svnweb.freebsd.org/changeset/ports/377692
QAT: https://qat.redports.org/buildarchive/r377692/

Log:
  Pass CFLAGS and LDFLAGS by default to scons build, again
  
  This fixes r355494 regression.
  
  PR:		193434
  Differential Revision:	https://reviews.freebsd.org/D1602
  Reviewed by:	bapt
  Approved by:	bapt (mentor)
  Approved by:	portmgr (bapt)

Modified:
  head/Mk/Uses/scons.mk
  head/audio/csound/Makefile

Modified: head/Mk/Uses/scons.mk
==============================================================================
--- head/Mk/Uses/scons.mk	Thu Jan 22 18:51:55 2015	(r377691)
+++ head/Mk/Uses/scons.mk	Thu Jan 22 18:52:26 2015	(r377692)
@@ -17,6 +17,8 @@ IGNORE=	Incorrect 'USES+= scons:${scons_
 MAKEFILE=		#
 MAKE_FLAGS=		#
 ALL_TARGET=		#
+CCFLAGS?=		${CFLAGS}
+LINKFLAGS?=		${LDFLAGS}
 LIBPATH?=		${LOCALBASE}/lib
 CPPPATH?=		${LOCALBASE}/include
 SCONS=			${LOCALBASE}/bin/scons

Modified: head/audio/csound/Makefile
==============================================================================
--- head/audio/csound/Makefile	Thu Jan 22 18:51:55 2015	(r377691)
+++ head/audio/csound/Makefile	Thu Jan 22 18:52:26 2015	(r377692)
@@ -52,6 +52,7 @@ SSP_UNSAFE=	yes
 
 CFLAGS+=	-fPIC -fopenmp -DUSE_OPENMP
 LDFLAGS+=	-pthread -Wl,-export-dynamic
+LINKFLAGS=	# empty
 
 SUB_FILES=	pkg-message
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501221852.t0MIqQpx047751>