From 3c5a215212a76932481c316d1259f4dc15c061fa Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Thu, 11 Oct 2018 00:38:25 +0000 Subject: user/oprofile: fix build on ... most arches, thx @Thalheim --- user/oprofile/APKBUILD | 2 +- user/oprofile/posixise.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/user/oprofile/APKBUILD b/user/oprofile/APKBUILD index b4730f3c4..90641b0e3 100644 --- a/user/oprofile/APKBUILD +++ b/user/oprofile/APKBUILD @@ -39,4 +39,4 @@ package() { sha512sums="02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba oprofile-1.3.0.tar.gz 9ad0e25f2ab165e6613d8fbd65b652fb82b41beef28f9edca6b763001d50fb5f35e433454a7beeecaa1d0d3adc9c9f16adc6d4d9f20ae9d27cc3120c04906576 disable-regex-test.patch -b19229521e28c871e432b15aab386c99c17f0ce3f9ab22b8669d64a8e0a22dd80ba7647ad903e9b71233815a457a3fa57aec9fb123cf7b28b04e61bc1ea250aa posixise.patch" +831fd9b18df0daaa01682c50479f432e81da951550db6d0b11315232b728517493533b41b46fd64f3e74405b8d515fb86d7b4b96898cf45b262a7e790a131740 posixise.patch" diff --git a/user/oprofile/posixise.patch b/user/oprofile/posixise.patch index dd2ead122..85e064b8c 100644 --- a/user/oprofile/posixise.patch +++ b/user/oprofile/posixise.patch @@ -41,3 +41,14 @@ errno = 0; if (nftw(previous_sampledir.c_str(), __delete_old_previous_sample_data, 32, flags) !=0 && errno != ENOENT) { +--- oprofile-1.3.0/libop/op_events.c.old 2018-01-18 16:46:48.000000000 +0000 ++++ oprofile-1.3.0/libop/op_events.c 2018-10-11 00:34:04.362677027 +0000 +@@ -83,7 +83,7 @@ + static u64 parse_long_hex(char const * str) + { + u64 value; +- if (sscanf(str, "%Lx", &value) != 1) ++ if (sscanf(str, "%llx", &value) != 1) + parse_error("expected long hexadecimal value"); + + fflush(stderr); -- cgit v1.2.3-60-g2f50