svn commit: r354274 - in head/math/sage: . files

[Stephen Montgomery-Smith]

Author: stephen
Date: Sat May 17 02:22:21 2014
New Revision: 354274
URL: http://svnweb.freebsd.org/changeset/ports/354274
QAT: https://qat.redports.org/buildarchive/r354274/

Log:
  - Small changes on the way to making it clang compliant.

Modified:
  head/math/sage/Makefile
  head/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure

Modified: head/math/sage/Makefile
==============================================================================
--- head/math/sage/Makefile	Sat May 17 01:43:53 2014	(r354273)
+++ head/math/sage/Makefile	Sat May 17 02:22:21 2014	(r354274)
@@ -74,17 +74,17 @@ post-patch:
 # Create the wrappers for the compiler invocations.
 	@${MKDIR} ${WRKSRC}/local/bin
 	@${LN} -s -f ${LOCALBASE}/bin/gmake ${WRKSRC}/local/bin/make
-	@${SED} -e 's#%%CC%%#${LOCALBASE}/bin/${CC}#' \
+	@${SED} -e "s#%%CC%%#`which ${CC}`#" \
 		-e 's#%%LDFLAGS%%#${LDFLAGS} ${FPM_FLAG}#' \
 		${FILESDIR}/gcc.in > ${WRKSRC}/local/bin/cc
 	@${CHMOD} +x ${WRKSRC}/local/bin/cc
 	@${LN} -s -f cc ${WRKSRC}/local/bin/gcc
-	@${SED} -e 's#%%CC%%#${LOCALBASE}/bin/${CXX}#' \
+	@${SED} -e "s#%%CC%%#`which ${CXX}`#" \
 		-e 's#%%LDFLAGS%%#${LDFLAGS} ${FPM_FLAG}#' \
 		${FILESDIR}/gcc.in > ${WRKSRC}/local/bin/c++
 	@${CHMOD} +x ${WRKSRC}/local/bin/c++
 	@${LN} -s -f c++ ${WRKSRC}/local/bin/g++
-	@${SED} -e 's#%%CC%%#${LOCALBASE}/bin/${FC}#' \
+	@${SED} -e "s#%%CC%%#`which ${FC}`#" \
 		-e 's#%%LDFLAGS%%#${LDFLAGS} ${FPM_FLAG}#' \
 		${FILESDIR}/gcc.in > ${WRKSRC}/local/bin/gfortran
 	@${CHMOD} +x ${WRKSRC}/local/bin/gfortran

Modified: head/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure
==============================================================================
--- head/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure	Sat May 17 01:43:53 2014	(r354273)
+++ head/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure	Sat May 17 02:22:21 2014	(r354274)
@@ -8,7 +8,7 @@
 + 	fi
 + 
 +-		MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@'
-++		MK_SHARED_LIB='${CC} -shared -Bshareable -soname=`basename $@` -o $@'
+++		MK_SHARED_LIB='${CC} -shared -Bshareable -Wl,-soname=`basename $@` -o $@'
 + 		;;
 + 	netbsd*) #(vi
 + 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"