From 7dcfeb54626712b69dd94221c48dbdbb2f48af92 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 4 Mar 2018 21:41:25 -0600 Subject: harmony/libevent: make tests pass on 32-bit arches --- harmony/libevent/APKBUILD | 4 +++- harmony/libevent/fix-test-on-32bit.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 harmony/libevent/fix-test-on-32bit.patch diff --git a/harmony/libevent/APKBUILD b/harmony/libevent/APKBUILD index 52ac71f9c..d49dfa5e1 100644 --- a/harmony/libevent/APKBUILD +++ b/harmony/libevent/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=libevent pkgver=2.1.8 -pkgrel=2 +pkgrel=3 pkgdesc="An event notification library" url="http://libevent.org/" arch="all" @@ -13,6 +13,7 @@ makedepends="$depends_dev openssl-dev" subpackages="$pkgname-dev" source="https://github.com/$pkgname/$pkgname/releases/download/release-${pkgver}-stable/$pkgname-${pkgver}-stable.tar.gz dont-test-fallback.patch + fix-test-on-32bit.patch py3_dumpevents.patch py3_rpcgen.patch " @@ -59,5 +60,6 @@ dev() { sha512sums="a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 libevent-2.1.8-stable.tar.gz d059a592252f83a918f0b6237e2dbee1d05822c83372bcd0f658a25428cce109fd088c5dec8320fef4c1aa7a713ada53aae9b7c04d7ca9b039ed4a483ba84146 dont-test-fallback.patch +7898a00eeab4af7ff3b7c1ee3b90e0d718beba435dfadf015f62084524b2b0f4049c8dd9e16926c61017c01faabf7a51c2f19be7f9532e01278d691acb98465d fix-test-on-32bit.patch 1f51788db3797870392997d0314fb744ee54d3b1a326d1b67f522fc7af65d50210cb137e8213d35a788bbf3c97aac18cd9860de8af3cb8c82f25e3ae07d662ae py3_dumpevents.patch 00d0b09425835638a5e29d96d70c855a5c57efb188157b80a3885a2dcbe88709b49ae57aeb6b8b590458a934116cf59934e6e32fbf684b2b3b8333c0dcac837e py3_rpcgen.patch" diff --git a/harmony/libevent/fix-test-on-32bit.patch b/harmony/libevent/fix-test-on-32bit.patch new file mode 100644 index 000000000..ec120a78c --- /dev/null +++ b/harmony/libevent/fix-test-on-32bit.patch @@ -0,0 +1,11 @@ +--- libevent-2.1.8-stable/test/regress_util.c.old 2018-03-04 21:14:24.344542520 -0600 ++++ libevent-2.1.8-stable/test/regress_util.c 2018-03-04 21:24:23.788814572 -0600 +@@ -1411,7 +1411,7 @@ + { 1255132800, "Sat, 10 Oct 2009 00:00:00 GMT"}, + { 1289433600, "Thu, 11 Nov 2010 00:00:00 GMT"}, + { 1323648000, "Mon, 12 Dec 2011 00:00:00 GMT"}, +-#ifndef _WIN32 ++#if !defined(_WIN32) && (!defined(__SIZEOF_LONG__) || __SIZEOF_LONG__ > 4) + /** In win32 case we have max "23:59:59 January 18, 2038, UTC" for time32 */ + { 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */, + /** In win32 case we have max "23:59:59, December 31, 3000, UTC" for time64 */ -- cgit v1.2.3-70-g09d2