mirror of https://github.com/JPyke3/mbp-manjaro
[Packages-Desktop] fix gcc pkg conflict in multilib
- see also https://github.com/manjaro/iso-profiles/issues/65
This commit is contained in:
parent
543ebadd6f
commit
b55145146e
|
@ -172,6 +172,7 @@ yelp
|
|||
>extra fakeroot
|
||||
>extra flex
|
||||
>extra gcc
|
||||
>extra >multilib gcc-libs-multilib
|
||||
>extra >multilib gcc-multilib
|
||||
>extra libtool
|
||||
>extra m4
|
||||
|
|
|
@ -28,6 +28,8 @@ dmidecode
|
|||
>extra flex
|
||||
>extra galculator
|
||||
>extra gcc
|
||||
>extra >multilib gcc-libs-multilib
|
||||
>extra >multilib gcc-multilib
|
||||
gedit
|
||||
>extra gimp
|
||||
gksu
|
||||
|
|
|
@ -27,6 +27,7 @@ flac
|
|||
# >extra flashplugin
|
||||
flex
|
||||
gcc
|
||||
>multilib gcc-libs-multilib
|
||||
>multilib gcc-multilib
|
||||
gcolor2
|
||||
gconf
|
||||
|
|
|
@ -52,6 +52,7 @@ bison
|
|||
fakeroot
|
||||
flex
|
||||
gcc
|
||||
>multilib gcc-libs-multilib
|
||||
>multilib gcc-multilib
|
||||
libtool
|
||||
m4
|
||||
|
|
|
@ -145,6 +145,7 @@ yelp
|
|||
>extra fakeroot
|
||||
>extra flex
|
||||
>extra gcc
|
||||
>extra >multilib gcc-libs-multilib
|
||||
>extra >multilib gcc-multilib
|
||||
>extra libtool
|
||||
>extra m4
|
||||
|
|
|
@ -153,6 +153,7 @@ gnome-getting-started-docs
|
|||
>extra fakeroot
|
||||
>extra flex
|
||||
>extra gcc
|
||||
>extra >multilib gcc-libs-multilib
|
||||
>extra >multilib gcc-multilib
|
||||
>extra libtool
|
||||
>extra m4
|
||||
|
|
|
@ -65,6 +65,7 @@ bison
|
|||
fakeroot
|
||||
flex
|
||||
gcc
|
||||
>multilib gcc-libs-multilib
|
||||
>multilib gcc-multilib
|
||||
libtool
|
||||
m4
|
||||
|
|
|
@ -57,6 +57,7 @@ bison
|
|||
fakeroot
|
||||
flex
|
||||
gcc
|
||||
>multilib gcc-libs-multilib
|
||||
>multilib gcc-multilib
|
||||
libtool
|
||||
m4
|
||||
|
|
|
@ -20,6 +20,7 @@ filesystem
|
|||
findutils
|
||||
gawk
|
||||
gcc-libs
|
||||
>multilib gcc-libs-multilib
|
||||
gettext
|
||||
glibc
|
||||
grep
|
||||
|
@ -48,7 +49,6 @@ memtest86+
|
|||
mhwd
|
||||
mhwd-db
|
||||
mkinitcpio-openswap
|
||||
>multilib gcc-libs-multilib
|
||||
nano
|
||||
ntfs-3g
|
||||
>openrc acpid-openrc
|
||||
|
|
|
@ -173,6 +173,7 @@ libyaml
|
|||
>extra fakeroot
|
||||
>extra flex
|
||||
>extra gcc
|
||||
>extra >multilib gcc-libs-multilib
|
||||
>extra >multilib gcc-multilib
|
||||
>extra libtool
|
||||
>extra m4
|
||||
|
|
Loading…
Reference in New Issue