libgcc: do not replace libgcj

We have a libgcj package again.

[ci skip]
This commit is contained in:
Johannes 2020-03-16 22:47:40 +01:00 committed by Juan RP
parent c2171056e6
commit ccecda2cda
1 changed files with 3 additions and 3 deletions

View File

@ -8,7 +8,7 @@ _isl_version=0.21
pkgname=gcc pkgname=gcc
version=${_minorver}.0 version=${_minorver}.0
revision=2 revision=3
short_desc="GNU Compiler Collection" short_desc="GNU Compiler Collection"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
homepage="http://gcc.gnu.org" homepage="http://gcc.gnu.org"
@ -616,7 +616,7 @@ libatomic_package() {
libgcc_package() { libgcc_package() {
short_desc+=" - GCC library" short_desc+=" - GCC library"
replaces="libgcj<7.2.0 libcilkrts<8.2.0" replaces="libcilkrts<8.2.0"
noverifyrdeps=yes noverifyrdeps=yes
pkg_install() { pkg_install() {
vmove "usr/lib/libgcc_s.so*" vmove "usr/lib/libgcc_s.so*"
@ -627,7 +627,7 @@ libgcc_package() {
libgcc-devel_package() { libgcc-devel_package() {
depends="libgcc-${version}_${revision}" depends="libgcc-${version}_${revision}"
short_desc+=" - GCC library - development files" short_desc+=" - GCC library - development files"
replaces="libgcj-devel<7.2.0 libcilkrts-devel<8.2.0" replaces="libcilkrts-devel<8.2.0"
pkg_install() { pkg_install() {
vmove "usr/lib/gcc/${_triplet}/${_minorver}/*.o" vmove "usr/lib/gcc/${_triplet}/${_minorver}/*.o"
vmove "usr/lib/gcc/${_triplet}/${_minorver}/*.a" vmove "usr/lib/gcc/${_triplet}/${_minorver}/*.a"