Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Feb 2014 20:59:16 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346225 - head/graphics/visionworkbench
Message-ID:  <201402262059.s1QKxGVm098513@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Wed Feb 26 20:59:16 2014
New Revision: 346225
URL: http://svnweb.freebsd.org/changeset/ports/346225
QAT: https://qat.redports.org/buildarchive/r346225/

Log:
  Replace the manual construction of ${LOCALBASE}/lib/${CC}, which is not
  appropriate for clang and fragile for GCC, by ${LDFLAGS}.
  
  This is not only more robust, ${LDFLAGS} will also provide -Wl,-rpath
  when necessary.
  
  Plus extend an existing CONFIGURE_ENV instead of overwriting it.
  
  With these changes, the configure problem that made the build fail
  goes away.  On FreeBSD 10.x and above there still are C++ errors
  later in the build, so leave the port BROKEN.
  
  Approved by:	swills (maintainer)
  With help from:	redports.org, mat, decke

Modified:
  head/graphics/visionworkbench/Makefile

Modified: head/graphics/visionworkbench/Makefile
==============================================================================
--- head/graphics/visionworkbench/Makefile	Wed Feb 26 20:42:52 2014	(r346224)
+++ head/graphics/visionworkbench/Makefile	Wed Feb 26 20:59:16 2014	(r346225)
@@ -47,7 +47,7 @@ CFLAGS+=	-Dtgammaf=tgamma
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
+CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
 post-patch:
@@ -55,7 +55,7 @@ post-patch:
 
 pre-configure:
 	echo "HAVE_PKG_FLAPACK=yes" >> ${WRKSRC}/config.options
-	echo "PKG_FLAPACK_LDFLAGS=-L${LOCALBASE}/lib/${CC}" >> ${WRKSRC}/config.options
+	echo "PKG_FLAPACK_LDFLAGS=${LDFLAGS}" >> ${WRKSRC}/config.options
 	echo "HAVE_PKG_PYTHON=yes" >> ${WRKSRC}/config.options
 	echo "PYTHON_LDFLAGS=-L${PYTHON_LIBDIR} -lboost_python -l${PYTHON_VERSION} ${PTHREAD_LIBS}" >> ${WRKSRC}/config.options
 	echo "PYTHON_CPPFLAGS=-I${PYTHON_INCLUDEDIR}" >> ${WRKSRC}/config.options



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