From eb003dc69ed816f08868ef4ebdac899d013cff72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 17 Dec 2013 06:41:48 +0000 Subject: main/znc: fix musl build --- main/znc/APKBUILD | 16 +++++++++++----- main/znc/fix-strerror_r.patch | 11 +++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 main/znc/fix-strerror_r.patch (limited to 'main/znc') diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD index db21cfaad..a00c97683 100644 --- a/main/znc/APKBUILD +++ b/main/znc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=znc pkgver=1.2 -pkgrel=0 +pkgrel=1 pkgdesc="An advanced IRC bouncer" url="http://znc.in" arch="all" @@ -14,7 +14,9 @@ makedepends="perl-dev openssl-dev cyrus-sasl-dev python-dev c-ares-dev swig install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-extra $pkgname-modtcl $pkgname-modperl" -source="http://znc.in/releases/znc-$pkgver.tar.gz" +source="http://znc.in/releases/znc-$pkgver.tar.gz + fix-strerror_r.patch + " _builddir="$srcdir"/znc-$pkgver prepare() { @@ -31,6 +33,7 @@ prepare() { build() { cd "$_builddir" export CHARSET= + export CFLAGS="$CFLAGS -D_GNU_SOURCE" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -100,6 +103,9 @@ modperl() { _mv_mod modperl modperl.so } -md5sums="ef18e5402a82cc3fcab5c2ac5c2e6f3b znc-1.2.tar.gz" -sha256sums="d9a2cd2a484ff23e6fc9cbde8dd8a43efbcd8d288afca7b1268914ca0d18701d znc-1.2.tar.gz" -sha512sums="dff24e56127e5599d64b4c62de967d5d48d8ebf23ca8597d33bf0b3622640512db7a462bfa7c2031cd8307f402bab8efa345f6d1fc813e78eb0dcae581de3cf7 znc-1.2.tar.gz" +md5sums="ef18e5402a82cc3fcab5c2ac5c2e6f3b znc-1.2.tar.gz +683043a298fcd79eda13a75a91f84c0b fix-strerror_r.patch" +sha256sums="d9a2cd2a484ff23e6fc9cbde8dd8a43efbcd8d288afca7b1268914ca0d18701d znc-1.2.tar.gz +06699125318a4caa88e04fa6031e8b0a5a87321720f352fbd63bd619c615401b fix-strerror_r.patch" +sha512sums="dff24e56127e5599d64b4c62de967d5d48d8ebf23ca8597d33bf0b3622640512db7a462bfa7c2031cd8307f402bab8efa345f6d1fc813e78eb0dcae581de3cf7 znc-1.2.tar.gz +c066fca1b97e7f5c4897221af6117c64492864f4800d755f0b285bc3df63faa34441625d2361dca4696461caaff0eccdd0ce8fdcf582df103f7caabd42f59ace fix-strerror_r.patch" diff --git a/main/znc/fix-strerror_r.patch b/main/znc/fix-strerror_r.patch new file mode 100644 index 000000000..9e3355bc7 --- /dev/null +++ b/main/znc/fix-strerror_r.patch @@ -0,0 +1,11 @@ +--- znc-1.2/src/Csocket.cpp.orig ++++ znc-1.2/src/Csocket.cpp +@@ -613,7 +613,7 @@ + return( strerror( iErrno ) ); + #else + memset( pszBuff, '\0', uBuffLen ); +-#if !defined( _GNU_SOURCE ) ++#if !defined( _GNU_SOURCE ) || !defined(__GLIBC__) + if( strerror_r( iErrno, pszBuff, uBuffLen ) == 0 ) + return( pszBuff ); + #else -- cgit v1.2.3