teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

musl, gettext: move the conflict to musl instead.

This commit is contained in:
Juan RP 2015-05-21 10:24:48 +02:00
parent bbb104e3c7
commit 91d05cd32c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
srcpkgs/gettext/template
View File

@ -1,7 +1,7 @@
# Template file for 'gettext' # Template file for 'gettext'
pkgname=gettext pkgname=gettext
version=0.19.4 version=0.19.4
revision=7 revision=8
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp configure_args="--disable-java --disable-native-java --disable-csharp
@ -33,7 +33,6 @@ gettext-devel-examples_package() {
} }
} }
gettext-devel_package() { gettext-devel_package() {
conflicts="musl>=1.1.9_4"
depends="gettext-libs>=${version}_${revision}" depends="gettext-libs>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {

4
srcpkgs/musl/template
View File

@ -1,7 +1,7 @@
# Template file for 'musl'. # Template file for 'musl'.
pkgname=musl pkgname=musl
version=1.1.9 version=1.1.9
revision=4 revision=5
build_style=gnu-configure build_style=gnu-configure
configure_args="--prefix=/usr --disable-gcc-wrapper" configure_args="--prefix=/usr --disable-gcc-wrapper"
conflicts="glibc>=0" conflicts="glibc>=0"
@ -12,6 +12,8 @@ homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
checksum=00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e checksum=00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e
# libintl.h conflict
conflicts="gettext-devel>=0"
nostrip_files="libc.so" nostrip_files="libc.so"
shlib_provides="libc.so" shlib_provides="libc.so"
only_for_archs="i686-musl x86_64-musl armv6l-musl armv7l-musl aarch64-musl" only_for_archs="i686-musl x86_64-musl armv6l-musl armv7l-musl aarch64-musl"