From 3d06b48248f3db950c46b688c3b5d0672a38e2a8 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 19 Dec 2016 16:28:36 +0100 Subject: main/llvm: purge dead patch autoconf is no longer used so we can remove patch that modifies config.guess --- main/llvm/APKBUILD | 12 ++++------- main/llvm/llvm-0009-nm-workaround.patch | 27 ++++++++++++++++++++++++ main/llvm/llvm-exit-config-when-cbuild-set.patch | 13 ------------ main/llvm/llvm-nm-workaround.patch | 27 ------------------------ 4 files changed, 31 insertions(+), 48 deletions(-) create mode 100644 main/llvm/llvm-0009-nm-workaround.patch delete mode 100644 main/llvm/llvm-exit-config-when-cbuild-set.patch delete mode 100644 main/llvm/llvm-nm-workaround.patch (limited to 'main') diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD index 940ae57627..873fc19129 100644 --- a/main/llvm/APKBUILD +++ b/main/llvm/APKBUILD @@ -36,8 +36,7 @@ source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz llvm-0006-clone-every-functions-debug-info.patch llvm-0007-reduce-complexity-of-debug-info-clonning-and-fix-correctness.patch llvm-0008-dont-widen-metadata-on-store-to-load-forwarding.patch - llvm-nm-workaround.patch - llvm-exit-config-when-cbuild-set.patch + llvm-0009-nm-workaround.patch " builddir="$srcdir/$pkgname-$pkgver.src" @@ -154,8 +153,7 @@ ade897d81b5ed522fa07bf045e779cbc llvm-0005-optimize-store-of-bitcast-from-vecto fc5ac9c103c97057526a0c98e965199d llvm-0006-clone-every-functions-debug-info.patch c06093bf71dba5edc87e3b1a2ea69b40 llvm-0007-reduce-complexity-of-debug-info-clonning-and-fix-correctness.patch 1646fff7966d8e727ff20e3891372e4f llvm-0008-dont-widen-metadata-on-store-to-load-forwarding.patch -785147afd8ab80fa95955a5637b6582f llvm-nm-workaround.patch -79d98688de62404b6276e3aa2ea01b01 llvm-exit-config-when-cbuild-set.patch" +785147afd8ab80fa95955a5637b6582f llvm-0009-nm-workaround.patch" sha256sums="6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9 llvm-3.8.1.src.tar.xz 708db2b21570e48e2c2e155a0c7b7969acecbb82393e306b5b69b0353ac108dd llvm-0001-Add-Musl-MuslEABI-and-Musl-EABIHF-triples.patch e1b0fd5f6918d8c8404f3ec4b8d3ab8fbe8dadc2d6011792349b56e5e8ee51e2 llvm-0002-Fix-build-with-musl-libc.patch @@ -165,8 +163,7 @@ a12615f51d4ebfc724bd6075dbab62b1632f42c9daed3f1e2d279e4985a7ccda llvm-0004-Fix- 1d109e00c6c904d0af5a4cc49b5fb0a5b895890ebdd3e3a1bc5d517e162afc1f llvm-0006-clone-every-functions-debug-info.patch 18e00ea15872e672a17b4797a88cea0d3fb4d80c5557455cc1e8e8f5ddda13d6 llvm-0007-reduce-complexity-of-debug-info-clonning-and-fix-correctness.patch 4c27b11af5d6e2b0c5a2c4e5b3dd49ef1b2aea9f5d55af72f75582de13bffefa llvm-0008-dont-widen-metadata-on-store-to-load-forwarding.patch -1870f910a6f5f2ba6144bd079ec55ed879fe8fd8b1b1b384935f36da43e5f114 llvm-nm-workaround.patch -8dca08e97637ae1ce5c99d8a6f7fefec9869ea1cda22fe33fe8ebd0a489d0df3 llvm-exit-config-when-cbuild-set.patch" +1870f910a6f5f2ba6144bd079ec55ed879fe8fd8b1b1b384935f36da43e5f114 llvm-0009-nm-workaround.patch" sha512sums="99bbb2cc5f337fd5edf1621f8028c8cb74011aa4af2531018dc05409b27f7b8d0c2f76a00115f677f7c013029d5d9f55d085a5b40433409aac4e9161d53bd366 llvm-3.8.1.src.tar.xz a97ad7a71ec4878f1a8a335dbc0c161323d957aeb95917b0c4837405c69b53b5f9718094e0e9fd7814c74f44aaa8cff3a9379202964b537c8162a53214621bc5 llvm-0001-Add-Musl-MuslEABI-and-Musl-EABIHF-triples.patch 4cb3fabbb627b596ce398ed717c66ad20bbea7092ba30751520cc5a63d38e1ac53d23e98a6ad82121ddcf2434383ba5cadbc2990f99a4528e99c6e2160c2f725 llvm-0002-Fix-build-with-musl-libc.patch @@ -176,5 +173,4 @@ f1cbbe0fc39151749ef5423619eb2855905535b2aaab5e6659bacfb14818e56c6b2205f258604db0 3f4625dab896f27645a45f2fa75efb2b25ee249379b110e7510b8908e7f16edf14907d431bacd8c5dc2821fd5740f3091c881d31c2d44a6aa415e6d06cd5d7f0 llvm-0006-clone-every-functions-debug-info.patch 3e9de70c000dfbf0e405d85607e10f2c61c608df957c6195560b9f4b583ddf4be30538846d86bee02038b23f9deedd773dccd24c3fee89a942a3e5e1f3d0ad4a llvm-0007-reduce-complexity-of-debug-info-clonning-and-fix-correctness.patch 6bb3e8e1b794737b1f411b5656f1a8e13e696c3c0cc8cb57297b371746713948f07c5c4fa93b57f90125f0da82550c1b6973e64575b636092d75fa05694610d2 llvm-0008-dont-widen-metadata-on-store-to-load-forwarding.patch -11db6f3c5d697bc536c7d053530f7a5572756185e16399c32c31306861b58046ca9bc14b8d8097758c00a8c1a7026cbfb75636c0e697e59c53dda5848f93b006 llvm-nm-workaround.patch -7a162897c0014ca7c0415edf8e2ab477c964a451db63a4a9a5852ad58e238da003fca9e821bf3cc130e0684ce03e0f2eee7371f819d5282be82b1876d49c52e4 llvm-exit-config-when-cbuild-set.patch" +11db6f3c5d697bc536c7d053530f7a5572756185e16399c32c31306861b58046ca9bc14b8d8097758c00a8c1a7026cbfb75636c0e697e59c53dda5848f93b006 llvm-0009-nm-workaround.patch" diff --git a/main/llvm/llvm-0009-nm-workaround.patch b/main/llvm/llvm-0009-nm-workaround.patch new file mode 100644 index 0000000000..5755e57ff3 --- /dev/null +++ b/main/llvm/llvm-0009-nm-workaround.patch @@ -0,0 +1,27 @@ +From https://llvm.org/bugs/show_bug.cgi?id=24115 + +diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp +index e7ee312..b9e4779 100644 +--- a/tools/llvm-nm/llvm-nm.cpp ++++ b/tools/llvm-nm/llvm-nm.cpp +@@ -486,7 +486,7 @@ static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName, + std::string ArchiveName, + std::string ArchitectureName) { + if (!NoSort) { +- std::function Cmp; ++ bool (*Cmp)(const NMSymbol &, const NMSymbol &); + if (NumericSort) + Cmp = compareSymbolAddress; + else if (SizeSort) +@@ -495,8 +495,9 @@ static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName, + Cmp = compareSymbolName; + + if (ReverseSort) +- Cmp = [=](const NMSymbol &A, const NMSymbol &B) { return Cmp(B, A); }; +- std::sort(SymbolList.begin(), SymbolList.end(), Cmp); ++ std::sort(SymbolList.begin(), SymbolList.end(), [=](const NMSymbol &A, const NMSymbol &B) { return Cmp(B, A); }); ++ else ++ std::sort(SymbolList.begin(), SymbolList.end(), Cmp); + } + + if (!PrintFileName) { diff --git a/main/llvm/llvm-exit-config-when-cbuild-set.patch b/main/llvm/llvm-exit-config-when-cbuild-set.patch deleted file mode 100644 index ffe0fd2f8f..0000000000 --- a/main/llvm/llvm-exit-config-when-cbuild-set.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/autoconf/config.guess 2016-08-04 01:13:53.941899947 +0200 -+++ b/autoconf/config.guess 2016-08-04 01:16:30.084553757 +0200 -@@ -142,6 +142,10 @@ - - # Note: order is significant - the case branches are not exclusive. - -+if [ -n "$CBUILD" ]; then -+ echo "ERROR: \$CBUILD is set: $CBUILD"; exit -+fi -+ - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or diff --git a/main/llvm/llvm-nm-workaround.patch b/main/llvm/llvm-nm-workaround.patch deleted file mode 100644 index 5755e57ff3..0000000000 --- a/main/llvm/llvm-nm-workaround.patch +++ /dev/null @@ -1,27 +0,0 @@ -From https://llvm.org/bugs/show_bug.cgi?id=24115 - -diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp -index e7ee312..b9e4779 100644 ---- a/tools/llvm-nm/llvm-nm.cpp -+++ b/tools/llvm-nm/llvm-nm.cpp -@@ -486,7 +486,7 @@ static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName, - std::string ArchiveName, - std::string ArchitectureName) { - if (!NoSort) { -- std::function Cmp; -+ bool (*Cmp)(const NMSymbol &, const NMSymbol &); - if (NumericSort) - Cmp = compareSymbolAddress; - else if (SizeSort) -@@ -495,8 +495,9 @@ static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName, - Cmp = compareSymbolName; - - if (ReverseSort) -- Cmp = [=](const NMSymbol &A, const NMSymbol &B) { return Cmp(B, A); }; -- std::sort(SymbolList.begin(), SymbolList.end(), Cmp); -+ std::sort(SymbolList.begin(), SymbolList.end(), [=](const NMSymbol &A, const NMSymbol &B) { return Cmp(B, A); }); -+ else -+ std::sort(SymbolList.begin(), SymbolList.end(), Cmp); - } - - if (!PrintFileName) { -- cgit v1.2.3