diff --git a/mingw-w64-libtool/0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch b/mingw-w64-libtool/0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch index e719caa9ae..99b0ed24da 100644 --- a/mingw-w64-libtool/0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch +++ b/mingw-w64-libtool/0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch @@ -17,8 +17,8 @@ index 1821779..eda7790 100644 + # link against specified runtime library -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*) -+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*| \ +- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -shared-libgcc|-static-libgcc|-static-libgfortran|-static-libstdc++) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result diff --git a/mingw-w64-libtool/0004-Fix-linking-with-fstack-protector.mingw.patch b/mingw-w64-libtool/0004-Fix-linking-with-fstack-protector.mingw.patch deleted file mode 100644 index 35653d7786..0000000000 --- a/mingw-w64-libtool/0004-Fix-linking-with-fstack-protector.mingw.patch +++ /dev/null @@ -1,29 +0,0 @@ -[PATCH 4/6] Fix linking with -fstack-protector -* build-aux/ltmain.in (func_mode_link): Pass -fstack-protector* -to the linker as it is required at link time to resolve libssp symbols. -Note: this patch is necessary but not sufficient for -fstack-protector* + C++. ---- - build-aux/ltmain.in | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index eda7790..74ab26a 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -5086,10 +5086,12 @@ func_mode_link () - # -stdlib=* select c++ std lib with clang - # -{shared,static}-libgcc, -static-{libgfortran|libstdc++} - # link against specified runtime library -+ # -fstack-protector* stack protector flags for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*| \ -- -shared-libgcc|-static-libgcc|-static-libgfortran|-static-libstdc++) -+ -shared-libgcc|-static-libgcc|-static-libgfortran|-static-libstdc++| \ -+ -fstack-protector*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result - func_append compile_command " $arg" --- -1.7.1 - diff --git a/mingw-w64-libtool/0008-find-external-libraries.patch b/mingw-w64-libtool/0008-find-external-libraries.patch deleted file mode 100644 index 6a197ab7e7..0000000000 --- a/mingw-w64-libtool/0008-find-external-libraries.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Peter Rosin -Date: Fri, 18 Jan 2013 10:40:37 +0100 -Subject: [PATCH] maint: find external libraries from a VPATH build - -Fixes bug#13462. - -* build-aux/ltmain.in: Assume that the external libraries are in the -same directory as this script. - -Signed-off-by: Peter Rosin ---- - build-aux/ltmain.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index c8cdb9c..2e85cb0 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -61,8 +61,8 @@ address@hidden@ - # Much of our low-level functionality needs to be sourced from external - # libraries, which are installed to $pkgauxdir. - --. "build-aux/funclib.sh" --. "build-aux/options-parser" -+. `echo "$0" |${SED-sed} 's|[^/]*$||'`"funclib.sh" -+. `echo "$0" |${SED-sed} 's|[^/]*$||'`"options-parser" - - # Set a version string. - scriptversion='(GNU @PACKAGE@) @VERSION@' --- -1.7.9 diff --git a/mingw-w64-libtool/PKGBUILD b/mingw-w64-libtool/PKGBUILD index 6046285de9..40bbe74290 100644 --- a/mingw-w64-libtool/PKGBUILD +++ b/mingw-w64-libtool/PKGBUILD @@ -1,9 +1,8 @@ # Maintainer: Alexey Pavlov _realname=libtool - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.4.2.418 +pkgver=2.4.3 pkgrel=1 pkgdesc="A system independent dlopen wrapper for GNU libtool (mingw-w64)" arch=('any') @@ -12,34 +11,28 @@ license=("GPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") groups=("${MINGW_PACKAGE_PREFIX}") options=('staticlibs' 'strip') -source=(#"http://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz" - ftp://alpha.gnu.org/gnu/libtool/libtool-2.4.2.418.tar.xz{,.sig} +source=("http://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz"{,.sig} + #ftp://alpha.gnu.org/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig} 0002-cygwin-mingw-Create-UAC-manifest-files.mingw.patch 0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch - 0004-Fix-linking-with-fstack-protector.mingw.patch 0005-Fix-seems-to-be-moved.patch 0006-Fix-strict-ansi-vs-posix.patch - 0007-fix-cr-for-awk-in-configure.all.patch - 0008-find-external-libraries.patch) -md5sums=('9f4aab3462f86b552f3ac74980d35308' + 0007-fix-cr-for-awk-in-configure.all.patch) +md5sums=('b5699a6d58f5594cdb0992c5e1f5e57e' 'SKIP' '091163f2cc8c2dd8c8d5574181eb53e1' - '8ec5b2977ce8c2188246873194100c04' - 'e34e8d23ebb7afcf3a0632373dc6f6fb' + '2396f4f169edb316d8d076897ff03347' 'bb4e559afa91865c0f9e489e19507922' 'cfc5378b9d8ac56800489841b8b90101' - '2200a7e2cfa8f5f3f9811f03ed41c46a' - '952d3f9e5e06956244db7a751aa6739a') + '2200a7e2cfa8f5f3f9811f03ed41c46a') prepare() { cd ${srcdir}/libtool-${pkgver} patch -p1 -i ${srcdir}/0002-cygwin-mingw-Create-UAC-manifest-files.mingw.patch patch -p1 -i ${srcdir}/0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch - patch -p1 -i ${srcdir}/0004-Fix-linking-with-fstack-protector.mingw.patch patch -p1 -i ${srcdir}/0005-Fix-seems-to-be-moved.patch patch -p1 -i ${srcdir}/0006-Fix-strict-ansi-vs-posix.patch patch -p1 -i ${srcdir}/0007-fix-cr-for-awk-in-configure.all.patch - patch -p1 -i ${srcdir}/0008-find-external-libraries.patch } build() {