diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2018-02-07 17:10:34 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-02-07 17:10:34 +0200 |
| commit | 32c3ea7c918f4083be4b5e27cbed8e28fdf5929e (patch) | |
| tree | c145af16312a395a891f346af57bdbaf155e8c0a /testing/elektra | |
| parent | b5c6c696837ee7d2aea4b7bed443e86e4608300f (diff) | |
| download | aports-32c3ea7c918f4083be4b5e27cbed8e28fdf5929e.tar.bz2 aports-32c3ea7c918f4083be4b5e27cbed8e28fdf5929e.tar.xz | |
testing/libelektra: fix build error on non-x86 hw
Diffstat (limited to 'testing/elektra')
| -rw-r--r-- | testing/elektra/APKBUILD | 7 | ||||
| -rw-r--r-- | testing/elektra/remove-unneeded-assembly.patch | 16 |
2 files changed, 21 insertions, 2 deletions
diff --git a/testing/elektra/APKBUILD b/testing/elektra/APKBUILD index c0e7eec8a0..f07a7a9ba0 100644 --- a/testing/elektra/APKBUILD +++ b/testing/elektra/APKBUILD @@ -59,7 +59,9 @@ subpackages=" source="$_pkgname-$pkgver.tar.gz::https://github.com/ElektraInitiative/$_pkgname/archive/$pkgver.tar.gz fix-bash-shebang.patch fix-augeas-internal-inconsistency.patch - cmake-allow-override-rpath.patch" + cmake-allow-override-rpath.patch + remove-unneeded-assembly.patch + " builddir="$srcdir/$_pkgname-$pkgver" options="!check" # FIXME! @@ -400,4 +402,5 @@ _submv() { sha512sums="9ad3bb7eeb36d921189d93cb347ec73262503d85397b574ef603080cee52d1959752740e5018a0e7eb5dc187bce8aae3b6fc0057a6385bce94e5338604c6bc57 libelektra-0.8.21.tar.gz cbfe8b96a806825d5f7194734a646bdb3fb273bf6be44b3b47e9b2f63bf90a7ece867e74808da743ff33211abba0682aba55d02a3dbfa0a5efc3dc821444bd87 fix-bash-shebang.patch 48d645142bf63282e13d1c76c1ddedc5633e365a1a87d0cd49c75fa801eed44b57fb66eee49badc7a9e6210f6ccd2af82779f0658f90263fd23b959f4e70b84c fix-augeas-internal-inconsistency.patch -717b343b6509d14949a154bbbf13d5722f47f97717dbd839763fc89f8f9033d5214f903df23b4ca7f196ae9dbfe6a3348542411c714e471ca4a50b39bdff3abc cmake-allow-override-rpath.patch" +717b343b6509d14949a154bbbf13d5722f47f97717dbd839763fc89f8f9033d5214f903df23b4ca7f196ae9dbfe6a3348542411c714e471ca4a50b39bdff3abc cmake-allow-override-rpath.patch +9ca27100c7b9e3b64146a4733e7007c6175ba475415cf7523315d21ba8fcfff65e3769ee2e9d59cdf2eb943a5c49786c4811e4deec6c694964da7e0e5292c1f9 remove-unneeded-assembly.patch" diff --git a/testing/elektra/remove-unneeded-assembly.patch b/testing/elektra/remove-unneeded-assembly.patch new file mode 100644 index 0000000000..f9968b67fd --- /dev/null +++ b/testing/elektra/remove-unneeded-assembly.patch @@ -0,0 +1,16 @@ +diff -ru libelektra-0.8.21.orig/tests/ctest/test_meta.c libelektra-0.8.21/tests/ctest/test_meta.c +--- libelektra-0.8.21.orig/tests/ctest/test_meta.c 2017-12-22 09:33:22.000000000 +0200 ++++ libelektra-0.8.21/tests/ctest/test_meta.c 2018-02-07 17:07:39.065186200 +0200 +@@ -339,12 +339,6 @@ + succeed_if_top (2, "/c"); + succeed_if_top (3, "/a"); + } +-uint64_t rdtsc (void) +-{ +- unsigned int lo, hi; +- __asm__ __volatile__("rdtsc" : "=a"(lo), "=d"(hi)); +- return ((uint64_t)hi << 32) | lo; +-} + static void test_top (void) + { + KeySet * test0 = ksNew (10, keyNew ("/a", KEY_VALUE, "whatever", KEY_END), KS_END); |