From cffdc2c9605c5a4104480ccaaeb8f32f85f4576f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Sat, 17 May 2025 09:16:14 +0100 Subject: [PATCH] Remove ${MINGW_PACKAGE_PREFIX}-binutils from makedepends. It's already a dependency of C/C++ compiler. --- mingw-w64-4th/PKGBUILD | 33 ++++++++++++++++----------- mingw-w64-crt-git/PKGBUILD | 1 - mingw-w64-ghc/PKGBUILD | 13 ++++------- mingw-w64-libmangle-git/PKGBUILD | 4 ++-- mingw-w64-msmpi/PKGBUILD | 11 ++++----- mingw-w64-winpthreads-git/PKGBUILD | 1 - mingw-w64-winstorecompat-git/PKGBUILD | 1 - 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mingw-w64-4th/PKGBUILD b/mingw-w64-4th/PKGBUILD index e8a4b7a914..0a653d3fce 100644 --- a/mingw-w64-4th/PKGBUILD +++ b/mingw-w64-4th/PKGBUILD @@ -7,31 +7,38 @@ pkgver=3.62.5 pkgrel=2 pkgdesc="A Forth Compiler (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://www.xs4all.nl/~thebeez/4tH/index.html" -license=('LGPL') -makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-binutils") +msys2_repository_url="https://sourceforge.net/p/forth-4th/code/HEAD/tree/trunk/" +license=('spdx:GPL-3.0-or-later') +makedepends=("${MINGW_PACKAGE_PREFIX}-cc") options=(!strip) -source=("${_realname}-${pkgver}.tar.gz"::"https://downloads.sourceforge.net/sourceforge/forth-4th/${_realname}-${pkgver}-x86_64.tar.gz") +source=("https://downloads.sourceforge.net/sourceforge/forth-4th/${_realname}-${pkgver}-x86_64.tar.gz") sha256sums=('e51ced7e71c942a27104baeae6cff68f44ae37a1c5813b6c12f9a3a1cfde309a') build() { - cd "${srcdir}/${_realname}-${pkgver}/sources/" [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM} - mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM} cp -R "${srcdir}"/${_realname}-${pkgver}/sources/. "${srcdir}"/build-${MSYSTEM} + cd "${srcdir}"/build-${MSYSTEM} + CROSS="${MINGW_PREFIX}/bin/" \ make -f Makefile.W32 CC="$CC" } package() { - cd "${srcdir}/${_realname}-${pkgver}/sources/" - install -D -m644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + cd "${srcdir}"/build-${MSYSTEM} + install -d "${pkgdir}${MINGW_PREFIX}/"{share/doc/${_realname},lib,bin} + CROSS="${MINGW_PREFIX}/bin/" \ - make -f Makefile.W32 CC="$CC" BINARIES="${pkgdir}${MINGW_PREFIX}/bin" \ - LIBRARIES="${pkgdir}${MINGW_PREFIX}/lib" \ - DOCDIR="${pkgdir}${MINGW_PREFIX}/share/doc" \ - MANDIR="${pkgdir}${MINGW_PREFIX}/share/man" install + make -f Makefile.W32 \ + CC="$CC" \ + BINARIES="${pkgdir}${MINGW_PREFIX}/bin" \ + LIBRARIES="${pkgdir}${MINGW_PREFIX}/lib" \ + DOCDIR="${pkgdir}${MINGW_PREFIX}/share/doc" \ + MANDIR="${pkgdir}${MINGW_PREFIX}/share/man" \ + install + + install -D -m644 "${srcdir}"/${_realname}-${pkgver}/COPYING \ + "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING } diff --git a/mingw-w64-crt-git/PKGBUILD b/mingw-w64-crt-git/PKGBUILD index c813a2f3e3..1a8033589d 100644 --- a/mingw-w64-crt-git/PKGBUILD +++ b/mingw-w64-crt-git/PKGBUILD @@ -15,7 +15,6 @@ license=('spdx:ZPL-2.1') groups=("${MINGW_PACKAGE_PREFIX}-toolchain") depends=("${MINGW_PACKAGE_PREFIX}-headers-git") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-autotools" "git") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") diff --git a/mingw-w64-ghc/PKGBUILD b/mingw-w64-ghc/PKGBUILD index 5c3a863aa4..7297e0bc52 100644 --- a/mingw-w64-ghc/PKGBUILD +++ b/mingw-w64-ghc/PKGBUILD @@ -12,18 +12,19 @@ mingw_arch=() group="${MINGW_PACKAGE_PREFIX}-haskell-platform" url='https://www.haskell.org/ghc/' license=('The Glasgow Haskell Compiler License') -depends=("${MINGW_PACKAGE_PREFIX}-binutils" - "${MINGW_PACKAGE_PREFIX}-crt" - "${MINGW_PACKAGE_PREFIX}-cc" +depends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-gmp" - "${MINGW_PACKAGE_PREFIX}-headers" "${MINGW_PACKAGE_PREFIX}-isl" "${MINGW_PACKAGE_PREFIX}-libiconv" "${MINGW_PACKAGE_PREFIX}-libffi" "${MINGW_PACKAGE_PREFIX}-libwinpthread" "${MINGW_PACKAGE_PREFIX}-mpc" "${MINGW_PACKAGE_PREFIX}-mpfr") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-sphinx" + "${MINGW_PACKAGE_PREFIX}-llvm" + "${MINGW_PACKAGE_PREFIX}-autotools" + 'perl') provides=("${MINGW_PACKAGE_PREFIX}-haskell-array=0.5.3.0" "${MINGW_PACKAGE_PREFIX}-haskell-base=4.12.0.0" "${MINGW_PACKAGE_PREFIX}-haskell-binary=0.8.6.0" @@ -88,10 +89,6 @@ replaces=("${MINGW_PACKAGE_PREFIX}-haskell-array" "${MINGW_PACKAGE_PREFIX}-haskell-win32" "${MINGW_PACKAGE_PREFIX}-haskell-xhtml" "${MINGW_PACKAGE_PREFIX}-haskell-cabal") -makedepends=("${MINGW_PACKAGE_PREFIX}-python3-sphinx" - "${MINGW_PACKAGE_PREFIX}-llvm" - "${MINGW_PACKAGE_PREFIX}-autotools" - 'perl') optdepends=("${MINGW_PACKAGE_PREFIX}-llvm: use LLVM for an optimized backend") install="ghc-${MSYSTEM}.install" diff --git a/mingw-w64-libmangle-git/PKGBUILD b/mingw-w64-libmangle-git/PKGBUILD index aad1f7f837..2cb1b405d5 100644 --- a/mingw-w64-libmangle-git/PKGBUILD +++ b/mingw-w64-libmangle-git/PKGBUILD @@ -16,7 +16,6 @@ msys2_repository_url="https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tr license=('spdx:MIT') groups=("${MINGW_PACKAGE_PREFIX}-toolchain") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-crt-git" "${MINGW_PACKAGE_PREFIX}-headers-git" @@ -42,5 +41,6 @@ build() { package() { cd "${srcdir}"/build-${MSYSTEM} make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}"/mingw-w64/mingw-w64-libraries/libmangle/COPYING "${pkgdir}"${MINGW_PREFIX}/share/licenses/mingw-w64-libraries/COPYING.${_realname} + install -Dm644 "${srcdir}"/mingw-w64/mingw-w64-libraries/libmangle/COPYING \ + "${pkgdir}"${MINGW_PREFIX}/share/licenses/mingw-w64-libraries/COPYING.${_realname} } diff --git a/mingw-w64-msmpi/PKGBUILD b/mingw-w64-msmpi/PKGBUILD index 7457984440..257d047e0b 100644 --- a/mingw-w64-msmpi/PKGBUILD +++ b/mingw-w64-msmpi/PKGBUILD @@ -4,16 +4,15 @@ _realname=msmpi pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=10.1.1 -pkgrel=13 +pkgrel=14 pkgdesc="Microsoft MPI SDK (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') url="https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi" -license=('MIT') -makedepends=("${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-cc") -depends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-fc") -optdepends=("${MINGW_PACKAGE_PREFIX}-tcl: build & run test suite") +license=('spdx:MIT') +depends=("${MINGW_PACKAGE_PREFIX}-cc") +optdepends=("${MINGW_PACKAGE_PREFIX}-fc: Build Fortran code") +checkdepends=("${MINGW_PACKAGE_PREFIX}-tcl: build & run test suite") source=( 'mpi.c' 'mpi.h' diff --git a/mingw-w64-winpthreads-git/PKGBUILD b/mingw-w64-winpthreads-git/PKGBUILD index 085844ba19..64e0bd12b5 100644 --- a/mingw-w64-winpthreads-git/PKGBUILD +++ b/mingw-w64-winpthreads-git/PKGBUILD @@ -19,7 +19,6 @@ arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') groups=("${MINGW_PACKAGE_PREFIX}-toolchain") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-crt-git" "${MINGW_PACKAGE_PREFIX}-headers-git" diff --git a/mingw-w64-winstorecompat-git/PKGBUILD b/mingw-w64-winstorecompat-git/PKGBUILD index 9960364f59..eb1c3052ad 100644 --- a/mingw-w64-winstorecompat-git/PKGBUILD +++ b/mingw-w64-winstorecompat-git/PKGBUILD @@ -14,7 +14,6 @@ msys2_repository_url="https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tr license=('spdx:MIT') groups=("${MINGW_PACKAGE_PREFIX}-toolchain") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-crt" "${MINGW_PACKAGE_PREFIX}-headers"