aboutsummaryrefslogtreecommitdiffstats
path: root/Mk/Uses
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2015-01-24 02:54:01 +0800
committertijl <tijl@FreeBSD.org>2015-01-24 02:54:01 +0800
commitb9bb9ed1d2712daf597be4109db93177904dfc3d (patch)
tree3c9652b1bff3b592d560e6ff9b93b49f9325dbf8 /Mk/Uses
parent02d2201c78b0442a3cfec5aa051e2bcfd3ce214c (diff)
downloadfreebsd-ports-gnome-b9bb9ed1d2712daf597be4109db93177904dfc3d.tar.gz
freebsd-ports-gnome-b9bb9ed1d2712daf597be4109db93177904dfc3d.tar.zst
freebsd-ports-gnome-b9bb9ed1d2712daf597be4109db93177904dfc3d.zip
- Update devel/automake to 1.15
- Update devel/gettext to 0.19.4 - Update devel/libtool and devel/libltdl to 2.4.5 - This version of libtool has been fixed to pass -fstack-protector to the compiler during linking. Add the same fix to USES=libtool. This should improve SSP support on FreeBSD/i386 8 and 9. - databases/libmemcached, security/sssd: patch configure.ac so AC_CONFIG_AUX_DIR appears earlier. For databases/libmemcached changing configure.ac causes manpages to be regenerated which requires extra dependencies so patch a makefile to prevent that. - devel/xfce4-dev-tools: only depend on recent versions of autoconf and automake PR: 196938 Exp-run by: antoine Approved by: portmgr (antoine)
Diffstat (limited to 'Mk/Uses')
-rw-r--r--Mk/Uses/autoreconf.mk4
-rw-r--r--Mk/Uses/libtool.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index fb4a29f296d1..fdadef8c1f79 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -57,8 +57,8 @@ _USES_POST+= autoreconf
BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR}/devel/autoconf \
autoheader-2.69:${PORTSDIR}/devel/autoconf \
autoreconf-2.69:${PORTSDIR}/devel/autoconf \
- aclocal-1.14:${PORTSDIR}/devel/automake \
- automake-1.14:${PORTSDIR}/devel/automake
+ aclocal-1.15:${PORTSDIR}/devel/automake \
+ automake-1.15:${PORTSDIR}/devel/automake
.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool
diff --git a/Mk/Uses/libtool.mk b/Mk/Uses/libtool.mk
index de121b7cd257..c73be3400e9f 100644
--- a/Mk/Uses/libtool.mk
+++ b/Mk/Uses/libtool.mk
@@ -57,7 +57,7 @@ patch-libtool:
-e '/if.*prog.*linkmode.*relink !=.*mode/s/if.*;/if :;/'\
-e '/if.*linkmode.*prog.*mode.* = relink/s/||.*;/;/' \
-e '/if.*prog.*linkmode.*relink = .*mode/s/||.*;/;/' \
- -e 's/|-p|-pg|/|-B*|-p|-pg|/'
+ -e 's/|-p|-pg|/|-B*|-fstack-protector*|-p|-pg|/'
patch-lafiles:
.if ${libtool_ARGS:Mkeepla}