From 1f2aec0611e9cb2d9a1d38109d5da4da328868e8 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 14 Jun 2015 15:45:15 +0200 Subject: [PATCH] celt051: fix musl build --- .../patches/musl-fix-gnuc-prereq.patch | 20 +++++++++++++++++++ srcpkgs/celt051/template | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/celt051/patches/musl-fix-gnuc-prereq.patch diff --git a/srcpkgs/celt051/patches/musl-fix-gnuc-prereq.patch b/srcpkgs/celt051/patches/musl-fix-gnuc-prereq.patch new file mode 100644 index 0000000000..552f05683b --- /dev/null +++ b/srcpkgs/celt051/patches/musl-fix-gnuc-prereq.patch @@ -0,0 +1,20 @@ +--- libcelt/ecintrin.h ++++ libcelt/ecintrin.h +@@ -52,8 +52,7 @@ + /*Count leading zeros. + This macro should only be used for implementing ec_ilog(), if it is defined. + All other code should use EC_ILOG() instead.*/ +-#ifdef __GNUC_PREREQ +-#if __GNUC_PREREQ(3,4) ++#if defined(__GNUC__) && ((__GNUC__<<16)+__GNUC_MINOR__) >= 0x304 + # if INT_MAX>=2147483647 + # define EC_CLZ0 sizeof(unsigned)*CHAR_BIT + # define EC_CLZ(_x) (__builtin_clz(_x)) +@@ -61,7 +60,6 @@ + # define EC_CLZ0 sizeof(unsigned long)*CHAR_BIT + # define EC_CLZ(_x) (__builtin_clzl(_x)) + # endif +-#endif + #endif + + #if defined(EC_CLZ) diff --git a/srcpkgs/celt051/template b/srcpkgs/celt051/template index c7ff1567a9..0179da6f5e 100644 --- a/srcpkgs/celt051/template +++ b/srcpkgs/celt051/template @@ -1,7 +1,7 @@ # Template file for 'celt051' pkgname=celt051 version=0.5.1.3 -revision=5 +revision=6 wrksrc=celt-${version} build_style=gnu-configure hostmakedepends="pkg-config" @@ -14,12 +14,12 @@ distfiles="http://downloads.us.xiph.org/releases/celt/celt-${version}.tar.gz" checksum=fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e celt051-devel_package() { - depends="libogg-devel ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove usr/lib/*.a + vmove usr/lib/*.so } }