diff options
| author | stephen <stephen@FreeBSD.org> | 2014-05-17 10:22:21 +0800 |
|---|---|---|
| committer | stephen <stephen@FreeBSD.org> | 2014-05-17 10:22:21 +0800 |
| commit | 16990d3b689fb483d51796e49a1a046a29e4cdfd (patch) | |
| tree | 2f154d2aec03086ca836d999c604bb0ff0c969ec /math | |
| parent | 2d23daf3ad815f3aa625084c1fc4373ce6824553 (diff) | |
| download | freebsd-ports-gnome-16990d3b689fb483d51796e49a1a046a29e4cdfd.tar.gz freebsd-ports-gnome-16990d3b689fb483d51796e49a1a046a29e4cdfd.tar.zst freebsd-ports-gnome-16990d3b689fb483d51796e49a1a046a29e4cdfd.zip | |
- Small changes on the way to making it clang compliant.
Diffstat (limited to 'math')
| -rw-r--r-- | math/sage/Makefile | 6 | ||||
| -rw-r--r-- | math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/math/sage/Makefile b/math/sage/Makefile index 5d0b4369c7aa..5d244550f242 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -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 diff --git a/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure b/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure index 72a0bf7a3ef8..a03c393c98de 100644 --- a/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure +++ b/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure @@ -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" |