Get rid of the msys2-devel group
For now adds a "provides=(msys2-devel)" to gcc to keep installation working and install the same set of packages. Next step is to makedepend on gcc where needed and remove msys2-devel from the docs.
This commit is contained in:
parent
d2b4a75126
commit
5bcd978cb0
@ -2,12 +2,11 @@
|
||||
|
||||
pkgname=binutils
|
||||
pkgver=2.37
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="A set of programs to assemble and manipulate binary and object files"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.gnu.org/software/binutils/"
|
||||
license=('GPL')
|
||||
groups=('msys2-devel')
|
||||
depends=('libiconv' 'libintl' 'zlib')
|
||||
checkdepends=('dejagnu' 'bc')
|
||||
makedepends=('libiconv-devel' 'gettext-devel' 'zlib-devel' 'autotools')
|
||||
|
||||
@ -8,10 +8,9 @@
|
||||
pkgbase=gcc
|
||||
pkgname=('gcc' 'gcc-libs' 'gcc-fortran')
|
||||
pkgver=11.2.0
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="The GNU Compiler Collection"
|
||||
arch=('i686' 'x86_64')
|
||||
groups=('msys2-devel')
|
||||
license=('GPL' 'LGPL' 'FDL' 'custom')
|
||||
url="https://gcc.gnu.org/"
|
||||
makedepends=('binutils' 'mpc-devel' 'gmp-devel'
|
||||
@ -246,6 +245,7 @@ package_gcc()
|
||||
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
|
||||
depends=("gcc-libs=${pkgver}-${pkgrel}" 'binutils' 'gmp' 'isl' 'mpc' 'mpfr' 'msys2-runtime-devel' 'msys2-w32api-headers' 'msys2-w32api-runtime' 'windows-default-manifest')
|
||||
options=('staticlibs' "$STRIP_OPTION" "$DEBUG_OPTION")
|
||||
provides=('msys2-devel')
|
||||
install=gcc.install
|
||||
|
||||
cd ${srcdir}/build-$(arch)
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
pkgbase=msys2-runtime
|
||||
pkgname=('msys2-runtime' 'msys2-runtime-devel')
|
||||
pkgver=3.3.3
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="Cygwin POSIX emulation engine"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.cygwin.com/"
|
||||
@ -223,7 +223,6 @@ package_msys2-runtime() {
|
||||
|
||||
package_msys2-runtime-devel() {
|
||||
pkgdesc="MSYS2 headers and libraries"
|
||||
groups=('msys2-devel')
|
||||
depends=("msys2-runtime=${pkgver}")
|
||||
options=('staticlibs' '!strip')
|
||||
conflicts=('libcatgets-devel')
|
||||
|
||||
@ -2,12 +2,11 @@
|
||||
|
||||
pkgname="msys2-w32api-headers"
|
||||
pkgver=9.0.0.6158.1c773877
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Win32 API headers for MSYS2 32bit toolchain"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://mingw-w64.sourceforge.io/"
|
||||
license=('custom')
|
||||
groups=('msys2-devel')
|
||||
depends=()
|
||||
makedepends=('git' 'mingw-w64-cross-gcc' 'autotools')
|
||||
options=('staticlibs' '!buildflags')
|
||||
|
||||
@ -2,12 +2,11 @@
|
||||
|
||||
pkgname="msys2-w32api-runtime"
|
||||
pkgver=9.0.0.6158.1c773877
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Win32 API import libs for MSYS2 toolchain"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://mingw-w64.sourceforge.io/"
|
||||
license=('custom')
|
||||
groups=('msys2-devel')
|
||||
depends=('msys2-w32api-headers')
|
||||
options=('staticlibs' '!strip' '!buildflags')
|
||||
makedepends=('git' 'mingw-w64-cross-gcc' 'autotools')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user