diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-01-21 03:45:09 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-01-21 03:45:09 +0100 |
| commit | dab21027d74c68c020527d38b542b1b434118811 (patch) | |
| tree | 88ce66f00224b3db719ef10bd4fe829382bdf990 | |
| parent | f8ff7cd3d3691dd2393301a29c4442f793db1fd6 (diff) | |
main/serf: switch to python3
| -rw-r--r-- | main/serf/APKBUILD | 18 | ||||
| -rw-r--r-- | main/serf/libressl.patch | 11 | ||||
| -rw-r--r-- | main/serf/scons-py3.patch | 24 |
3 files changed, 32 insertions, 21 deletions
diff --git a/main/serf/APKBUILD b/main/serf/APKBUILD index 9f66add4188..41c5c913a0b 100644 --- a/main/serf/APKBUILD +++ b/main/serf/APKBUILD @@ -6,24 +6,22 @@ pkgdesc="High-Performance Asynchronous HTTP Client Library" url="http://serf.apache.org/" arch="all" license="Apache-2.0" -makedepends="apr-util-dev apr-dev openssl-dev zlib-dev scons chrpath python2" +makedepends="apr-util-dev apr-dev openssl-dev zlib-dev scons chrpath" subpackages="$pkgname-dev" -source="https://archive.apache.org/dist/$pkgname/$pkgname-$pkgver.tar.bz2 - libressl.patch +source="https://archive.apache.org/dist/serf/serf-$pkgver.tar.bz2 + scons-py3.patch " -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" - scons PREFIX=/usr + ln -s /usr/bin/python3 python + export PATH="$PATH:." + scons CFLAGS="$CFLAGS" LINKFLAGS="$LDFLAGS" PREFIX=/usr } package() { - cd "$builddir" - install -d "$pkgdir/usr" - scons PREFIX="$pkgdir/usr" install + scons install --install-sandbox="$pkgdir" chrpath -d "$pkgdir"/usr/lib/libserf-1.so* } sha512sums="9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d serf-1.3.9.tar.bz2 -f3e293124fbad9f7cd75f578e88259fd5a706eb56259d19be711c6e7527913c19146854042c4a7f6c14f828d2c14f8b42d2c71ae736d475df388bba8e0bd4df4 libressl.patch" +61547b360d92c29569d60c1e137f009c214e95cffd2edd20a7374da5b659c258d34759252d6ad6958eb7da0aa58fbb374153ee92323f0b84dc4b350f2ede17a1 scons-py3.patch" diff --git a/main/serf/libressl.patch b/main/serf/libressl.patch deleted file mode 100644 index 7a89cea046f..00000000000 --- a/main/serf/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 - diff --git a/main/serf/scons-py3.patch b/main/serf/scons-py3.patch new file mode 100644 index 00000000000..144f5e39eae --- /dev/null +++ b/main/serf/scons-py3.patch @@ -0,0 +1,24 @@ +--- serf-1.3.9/SConstruct.orig 2019-07-26 17:49:30.910189251 +0000 ++++ serf-1.3.9/SConstruct 2019-07-26 17:49:54.073821735 +0000 +@@ -163,9 +163,9 @@ + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +183,7 @@ + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print ('Warning: Used unknown variables:', ', '.join(unknown.keys())) + + apr = str(env['APR']) + apu = str(env['APU']) |