Remove dependency on libssp - Part1

msys2 · Oct 8, 2022 · 2f8b473 · 2f8b473
1 parent be6e9d9
commit 2f8b473
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/mingw-w64-arm-none-eabi-gdb/PKGBUILD b/mingw-w64-arm-none-eabi-gdb/PKGBUILD
@@ -8,7 +8,7 @@ _target=arm-none-eabi
 pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
 pkgver=9.2
-pkgrel=5
+pkgrel=6
 pkgdesc='GNU Tools for ARM Embedded Processors - GDB (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -38,7 +38,6 @@ sha256sums=(
 )
 depends=("${MINGW_PACKAGE_PREFIX}-expat"
          "${MINGW_PACKAGE_PREFIX}-libiconv"
-         "${MINGW_PACKAGE_PREFIX}-libssp"
          "${MINGW_PACKAGE_PREFIX}-ncurses"
          "${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-readline"
@@ -85,7 +84,6 @@ build() {
     CPPFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
     CFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
     CXXFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
-    LDFLAGS+=" -fstack-protector"
 
     ../configure \
         --build=${MINGW_CHOST} \

diff --git a/mingw-w64-drmingw/PKGBUILD b/mingw-w64-drmingw/PKGBUILD
@@ -5,13 +5,12 @@ _realname=drmingw
 pkgbase="mingw-w64-${_realname}"
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname})
 pkgver=0.9.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Just-in-Time (JIT) debugger (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=(LGPL2.1)
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-libssp")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-discount"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"

diff --git a/mingw-w64-gdb/PKGBUILD b/mingw-w64-gdb/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-multiarch")
 pkgver=12.1
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU Debugger (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,7 +16,6 @@ groups=($( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_P
 depends=("${MINGW_PACKAGE_PREFIX}-expat"
          "${MINGW_PACKAGE_PREFIX}-gmp"
          "${MINGW_PACKAGE_PREFIX}-libiconv"
-         "${MINGW_PACKAGE_PREFIX}-libssp"
          "${MINGW_PACKAGE_PREFIX}-mpfr"
          "${MINGW_PACKAGE_PREFIX}-ncurses"
          "${MINGW_PACKAGE_PREFIX}-python"
@@ -68,7 +67,7 @@ prepare() {
 }
 
 do_build() {
-  builddir=${srcdir}/build-${MINGW_CHOST}$1
+  builddir=${srcdir}/build-${MSYSTEM}$1
   [[ -d ${builddir} ]] && rm -rf ${builddir}
   mkdir ${builddir} && cd ${builddir}
 
@@ -85,7 +84,6 @@ do_build() {
   CPPFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
   CFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
   CXXFLAGS+=" -I${MINGW_PREFIX}/include/ncurses"
-  LDFLAGS+=" -fstack-protector"
 
   ../${_realname}-${pkgver}/configure \
     --build=${MINGW_CHOST} \
@@ -119,7 +117,7 @@ build() {
 }
 
 package_gdb() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 
   # Remove unwanted files
@@ -135,8 +133,8 @@ package_gdb-multiarch() {
 
   destdir=${pkgdir}${MINGW_PREFIX}/bin
   mkdir -p $destdir
-  strip -o ${destdir}/gdb-multiarch.exe ${srcdir}/build-${MINGW_CHOST}-multiarch/gdb/gdb.exe
-  strip -o ${destdir}/gdbserver-multiarch.exe ${srcdir}/build-${MINGW_CHOST}-multiarch/gdbserver/gdbserver.exe
+  strip -o ${destdir}/gdb-multiarch.exe ${srcdir}/build-${MSYSTEM}-multiarch/gdb/gdb.exe
+  strip -o ${destdir}/gdbserver-multiarch.exe ${srcdir}/build-${MSYSTEM}-multiarch/gdbserver/gdbserver.exe
 }
 
 # template start; name=mingw-w64-splitpkg-wrappers; version=1.0;

diff --git a/mingw-w64-hexchat/PKGBUILD b/mingw-w64-hexchat/PKGBUILD
@@ -4,7 +4,7 @@ _realname=hexchat
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.16.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A popular and easy to use graphical IRC (chat) client (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -15,7 +15,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-dbus-glib"
          "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
          "${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-gtk2"
-         "${MINGW_PACKAGE_PREFIX}-libssp"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-pango")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"

diff --git a/mingw-w64-libvoikko/PKGBUILD b/mingw-w64-libvoikko/PKGBUILD
@@ -4,14 +4,13 @@ _realname=libvoikko
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=4.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A spelling and grammar checker, hyphenator and collection of related linguistic data for Finnish language (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://voikko.sourceforge.io/"
 license=('GPL2')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-libssp"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 source=("https://www.puimula.org/voikko-sources/${_realname}/${_realname}-${pkgver}.tar.gz"{,.asc})
@@ -33,7 +32,6 @@ build() {
   # Workaround encoding error
   export LANG="en_US.UTF-8"
 
-  LDFLAGS+=" -fstack-protector" \
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \