diff options
| -rw-r--r-- | testing/php7-tideways_xhprof/73.patch | 61 | ||||
| -rw-r--r-- | testing/php7-tideways_xhprof/APKBUILD | 10 |
2 files changed, 67 insertions, 4 deletions
diff --git a/testing/php7-tideways_xhprof/73.patch b/testing/php7-tideways_xhprof/73.patch new file mode 100644 index 0000000000..1986d0572e --- /dev/null +++ b/testing/php7-tideways_xhprof/73.patch @@ -0,0 +1,61 @@ +From 6670474519ddd1852276bd8231d1387f8bab0474 Mon Sep 17 00:00:00 2001 +From: Benjamin Eberlei <kontakt@beberlei.de> +Date: Thu, 7 Feb 2019 17:46:10 +0100 +Subject: [PATCH 1/2] Add #include "stdint.h" to please Alpine/Musl? + +--- + timer.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/timer.h b/timer.h +index ecd940f..8db0440 100644 +--- a/timer.h ++++ b/timer.h +@@ -11,6 +11,7 @@ + #include "win32/getrusage.h" + #else + ++#include "stdint.h" + #include <sys/time.h> + #include <sys/resource.h> + #endif + +From 4f4ebbbaf2347436c18725e11bf3d03d6781ba05 Mon Sep 17 00:00:00 2001 +From: Benjamin Eberlei <kontakt@beberlei.de> +Date: Fri, 8 Feb 2019 19:46:05 +0100 +Subject: [PATCH 2/2] Move type definition around. + +--- + timer.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/timer.h b/timer.h +index 8db0440..fd535e7 100644 +--- a/timer.h ++++ b/timer.h +@@ -11,7 +11,6 @@ + #include "win32/getrusage.h" + #else + +-#include "stdint.h" + #include <sys/time.h> + #include <sys/resource.h> + #endif +@@ -54,6 +53,9 @@ static zend_always_inline uint64 time_milliseconds(int source, double timebase_f + struct timespec s; + uint32 a, d; + uint64 val; ++#if defined(__i386__) ++ int64_t ret; ++#endif + + switch (source) { + #if HAVE_CLOCK_GETTIME +@@ -77,7 +79,6 @@ static zend_always_inline uint64 time_milliseconds(int source, double timebase_f + #endif + case TIDEWAYS_XHPROF_CLOCK_TSC: + #if defined(__i386__) +- int64_t ret; + __asm__ volatile("rdtsc" : "=A"(ret)); + return ret; + #elif defined(__x86_64__) || defined(__amd64__) diff --git a/testing/php7-tideways_xhprof/APKBUILD b/testing/php7-tideways_xhprof/APKBUILD index fa551734ff..06cd28ed8b 100644 --- a/testing/php7-tideways_xhprof/APKBUILD +++ b/testing/php7-tideways_xhprof/APKBUILD @@ -5,14 +5,15 @@ _pkgext=tideways_xhprof _pkgreal=php-xhprof-extension pkgver=5.0_beta3 _pkgver=${pkgver/_/-} -pkgrel=1 +pkgrel=2 pkgdesc="Modern XHProf compatible Profiler for PHP 7" url="http://tideways.io" -arch="all !x86 !armhf !armv7 !aarch64 !s390x" # fails to build +arch="all !armhf !armv7 !aarch64 !s390x" # fails to build license="Apache-2.0" depends="php7" makedepends="php7-dev autoconf" -source="$pkgname-$pkgver.tar.gz::https://github.com/tideways/$_pkgreal/archive/v$_pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/tideways/php-xhprof-extension/archive/v$_pkgver.tar.gz + 73.patch" builddir="$srcdir/$_pkgreal-$_pkgver" build() { @@ -37,4 +38,5 @@ package() { echo "extension=$_pkgext.so" > "$pkgdir"/etc/php7/conf.d/$_pkgext.ini } -sha512sums="5b682ed8cda21236c54c3161645620ba06f14478fcf1b45684788b742e47d63419b3e3f74da7d3e376ce5fafeb215ed40d080aaac0c2a8799315f83c877e3110 php7-tideways_xhprof-5.0_beta3.tar.gz" +sha512sums="5b682ed8cda21236c54c3161645620ba06f14478fcf1b45684788b742e47d63419b3e3f74da7d3e376ce5fafeb215ed40d080aaac0c2a8799315f83c877e3110 php7-tideways_xhprof-5.0_beta3.tar.gz +2dfee43f28d7872f08688b354b25c177bb16a5474d2df999be0155362998841c1afa0b5adaf41d016be8c9e50f669d0f69bd56891d4e1e4ef999b9ea2118dfa8 73.patch" |