diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2016-12-07 15:31:11 +0100 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-12-07 15:38:38 +0100 |
| commit | 48ecb940bbb76eb2e3832b552791c6c752b39d91 (patch) | |
| tree | 882ca49c2d81155aeacaf33ce81b4d2841ed51f9 /main/serf | |
| parent | 2de46c6cd7e82ecc88296d1d9f21cd7b4889b04c (diff) | |
| download | aports-48ecb940bbb76eb2e3832b552791c6c752b39d91.tar.bz2 aports-48ecb940bbb76eb2e3832b552791c6c752b39d91.tar.xz | |
main/serf: fix build with libressl
Diffstat (limited to 'main/serf')
| -rw-r--r-- | main/serf/APKBUILD | 33 | ||||
| -rw-r--r-- | main/serf/libressl.patch | 11 |
2 files changed, 25 insertions, 19 deletions
diff --git a/main/serf/APKBUILD b/main/serf/APKBUILD index 1c4a7d6a56..05f8a7a3d5 100644 --- a/main/serf/APKBUILD +++ b/main/serf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=serf pkgver=1.3.9 -pkgrel=0 +pkgrel=1 pkgdesc="High-Performance Asynchronous HTTP Client Library" url="http://serf.apache.org/" arch="all" @@ -12,31 +12,26 @@ makedepends="$depends_dev apr-util-dev apr-dev libressl-dev zlib-dev scons chrpath" install="" subpackages="$pkgname-dev" -source="https://archive.apache.org/dist/serf/serf-$pkgver.tar.bz2" - -_builddir="$srcdir"/serf-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +source="https://archive.apache.org/dist/serf/serf-$pkgver.tar.bz2 + libressl.patch + " +builddir="$srcdir"/serf-$pkgver build() { - cd "$_builddir" + cd "$builddir" scons PREFIX=/usr || return 1 } package() { - cd "$_builddir" + cd "$builddir" install -d "${pkgdir}/usr" - scons PREFIX="${pkgdir}/usr" install + scons PREFIX="${pkgdir}/usr" install || return 1 chrpath -d "$pkgdir"/usr/lib/libserf-1.so* } -md5sums="370a6340ff20366ab088012cd13f2b57 serf-1.3.9.tar.bz2" -sha256sums="549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc serf-1.3.9.tar.bz2" -sha512sums="9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d serf-1.3.9.tar.bz2" +md5sums="370a6340ff20366ab088012cd13f2b57 serf-1.3.9.tar.bz2 +e8f86d99e68ade1500cf2ce564818485 libressl.patch" +sha256sums="549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc serf-1.3.9.tar.bz2 +36539895e27757e5a5bf3a3f343c34de9c970fa07c82890b83178fdadbc06fd2 libressl.patch" +sha512sums="9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d serf-1.3.9.tar.bz2 +f3e293124fbad9f7cd75f578e88259fd5a706eb56259d19be711c6e7527913c19146854042c4a7f6c14f828d2c14f8b42d2c71ae736d475df388bba8e0bd4df4 libressl.patch" diff --git a/main/serf/libressl.patch b/main/serf/libressl.patch new file mode 100644 index 0000000000..7a89cea046 --- /dev/null +++ b/main/serf/libressl.patch @@ -0,0 +1,11 @@ +--- ./buckets/ssl_buckets.c.orig ++++ ./buckets/ssl_buckets.c +@@ -52,7 +52,7 @@ + #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary))) + #endif + +-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + #define USE_OPENSSL_1_1_API + #endif + |