diff options
| -rw-r--r-- | user/clang/0001-Add-support-for-Ad-lie-Linux.patch | 4 | ||||
| -rw-r--r-- | user/clang/APKBUILD | 43 | ||||
| -rw-r--r-- | user/clang/cfe-005-ppc64-dynamic-linker-path.patch | 2 | ||||
| -rw-r--r-- | user/clang/pmmx-musl.patch | 2 | ||||
| -rw-r--r-- | user/clang/ppc64-elfv2.patch | 2 | ||||
| -rw-r--r-- | user/clang/secure-plt.patch | 4 | ||||
| -rw-r--r-- | user/clang/use-llvm-lit.patch | 2 |
7 files changed, 28 insertions, 31 deletions
diff --git a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch index 6fdb58542..4c2ef219f 100644 --- a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch +++ b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch @@ -54,7 +54,7 @@ index 2c4d44faf8..7ef35ab379 100644 --- cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp.old 2018-11-29 18:52:22.000000000 +0000 +++ cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp 2019-04-23 23:49:37.786181838 +0000 -@@ -236,13 +236,13 @@ +@@ -241,13 +241,13 @@ Distro Distro(D.getVFS()); @@ -70,7 +70,7 @@ index 2c4d44faf8..7ef35ab379 100644 ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } -@@ -285,7 +285,8 @@ +@@ -290,7 +290,8 @@ if (!IsMips && !IsHexagon) { if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) || diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index bd24476b8..1430b26e8 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=clang # Note: Update together with llvm. -pkgver=8.0.0 +pkgver=8.0.1 pkgrel=0 _llvmver=${pkgver%%.*} pkgdesc="A C language family front-end for LLVM" @@ -16,7 +16,7 @@ makedepends="cmake isl-dev libedit-dev libexecinfo-dev libxml2-dev libxml2-utils z3 z3-dev" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-analyzer::noarch" -source="https://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz +source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/cfe-$pkgver.src.tar.xz 0001-Add-support-for-Ad-lie-Linux.patch 0008-Fix-ClangConfig-cmake-LLVM-path.patch cfe-005-ppc64-dynamic-linker-path.patch @@ -28,11 +28,8 @@ source="https://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz builddir="$srcdir/cfe-$pkgver.src" build() { - mkdir -p "$builddir"/build - cd "$builddir"/build - CMAKE_PREFIX_PATH=/usr/lib/llvm$_llvmver/lib/cmake \ - cmake .. -Wno-dev \ + cmake -Wno-dev \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_VERBOSE_MAKEFILE=OFF \ @@ -43,29 +40,29 @@ build() { -DCLANG_PLUGIN_SUPPORT=ON \ -DLIBCLANG_BUILD_STATIC=ON \ -DLLVM_ENABLE_EH=ON \ - -DLLVM_ENABLE_RTTI=ON + -DLLVM_ENABLE_RTTI=ON \ + -Bbuild \ + . - make clang-tblgen + make -C build clang-tblgen # too memory hungry if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then - make -j32 + make -C build -j32 else - make + make -C build fi } check() { - cd "$builddir"/build - [ -f bin/llvm-lit ] || ln -s /usr/bin/lit bin/llvm-lit - make check-clang + [ -f build/bin/llvm-lit ] || ln -s /usr/bin/lit build/bin/llvm-lit + make -C build check-clang } package() { local _dir _file - cd "$builddir"/build - make DESTDIR="$pkgdir" install - install -m 644 lib/libclang.a "$pkgdir"/usr/lib + make DESTDIR="$pkgdir" -C build install + install -m 644 build/lib/libclang.a "$pkgdir"/usr/lib # mozilla will never be happy mkdir -p "$pkgdir"/usr/lib/llvm$_llvmver/bin @@ -108,11 +105,11 @@ analyzer() { mv usr/share/scan-* "$subpkgdir"/usr/share/ } -sha512sums="98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3 cfe-8.0.0.src.tar.xz -c3218a1622f53bb6bef65f844e32e1b048a1ed7d5aa444a7592f9b8e8543d41438a0ac032674adb2c1bf0ef8c6fbd6880c34f8c8e778a8fd31bb542968a3547e 0001-Add-support-for-Ad-lie-Linux.patch +sha512sums="1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d cfe-8.0.1.src.tar.xz +15f8c4e3453c0620ccd47e5dae37de29f722bc5f16aa64a3ff1ac2a2d522dd3e13dada539f1944c51f334d0f91ac60d0189578c252c49ba39d17cdf42021086b 0001-Add-support-for-Ad-lie-Linux.patch 9485fe4fd6182df543735ed8f4ce618693d0faeafa86d3f9574a6c7abf50978e2d56e0a94be3ed94d515cc937c388d66ceff1bbc9bb120d371b6d3e95340da00 0008-Fix-ClangConfig-cmake-LLVM-path.patch -e24b0eb5f0f2b58f8d18d7d191dccc76510a179738db1f42624bd68c6de92ea57d323e28f9ee1e4df59e44a2c00a23527ba21c1c1fce9ac5858db9b3049914f2 cfe-005-ppc64-dynamic-linker-path.patch -1a76a74c193ea59b0114b116c5a9a7807b40a449e9c601263379fd7252867adb8ea8d4720f9fc8d801748176976d968990be29323bff9d5f3a03c4cfe80c61c4 pmmx-musl.patch -26b6cb952a77e15f113c88f2417e510ddd496f5c3c3de2e51c1a7cf14a78d0b25cd881f40c5c7e95dde3b2b63bbd3d485544097eed8673669a755b456a1dcd71 ppc64-elfv2.patch -9dad6dfb0097f79939b743dbe7ed20274c463d9c41f061a957841c60070247a4760b676465652e2e844fc75aab9a5b7f9f4dd7632f2ff5dd5b0a335fcbd29312 secure-plt.patch -8a596e7369b5791e7e9c3278320aa5bac30d91f27d9a0df335ea862c359623869353d12145c3b64730f721600522f3acc5abe706428091482e0209e4ff308175 use-llvm-lit.patch" +ee5606b130354983202a1d7c96183ea81dec1048a92dc059bbc07fd4e8e21c1279064422d8f432d2b6e5d88d883f1e2c8f8dada716d82ae4068c9fea3e1b0a54 cfe-005-ppc64-dynamic-linker-path.patch +13b6b03798c724f1444d8639cfab0c971560618ff7a61f461bde5ab004bdbadbf9960ab30bbb19fcc9e305712b66a22bf88998f2cdd6f5e3ba7065539abc40a0 pmmx-musl.patch +de0b806ad632c76789f7cf750e6b23cc72b3708a9566ef25d5ac3f51840972163a57304802259a0408fb33f44334ec12cef49600f766e8329af489c9a991af74 ppc64-elfv2.patch +08a231b73561c78195a717aed022c60264b3d77ad01df07835fec397994b09cf703fe16ad7a8f62acdc37269e0a6ef8bd07c3289db58490440c766f58c3af239 secure-plt.patch +1b0e7fe72de58a5a22d4c4afe7c3bcab23244e6e5e01df43752a38b4cafcfb47ba1877641db285cd31869d5521657b6c6280506d872c25191b10a8661b43b0fe use-llvm-lit.patch" diff --git a/user/clang/cfe-005-ppc64-dynamic-linker-path.patch b/user/clang/cfe-005-ppc64-dynamic-linker-path.patch index d559d949b..b4c41b1c3 100644 --- a/user/clang/cfe-005-ppc64-dynamic-linker-path.patch +++ b/user/clang/cfe-005-ppc64-dynamic-linker-path.patch @@ -1,6 +1,6 @@ --- a/lib/Driver/ToolChains/Linux.cpp +++ b/lib/Driver/ToolChains/Linux.cpp -@@ -590,12 +590,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { +@@ -596,12 +596,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { Loader = "ld.so.1"; break; case llvm::Triple::ppc64: diff --git a/user/clang/pmmx-musl.patch b/user/clang/pmmx-musl.patch index 7286c0ab8..2a3803349 100644 --- a/user/clang/pmmx-musl.patch +++ b/user/clang/pmmx-musl.patch @@ -1,6 +1,6 @@ --- cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp.old 2018-11-29 18:52:22.000000000 +0000 +++ cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp 2019-06-01 23:22:27.015221397 +0000 -@@ -528,6 +528,9 @@ +@@ -534,6 +534,9 @@ ArchName = "armeb"; IsArm = true; break; diff --git a/user/clang/ppc64-elfv2.patch b/user/clang/ppc64-elfv2.patch index 59f300ebc..236bd9ae8 100644 --- a/user/clang/ppc64-elfv2.patch +++ b/user/clang/ppc64-elfv2.patch @@ -27,7 +27,7 @@ } --- cfe-8.0.0.src/lib/Driver/ToolChains/Clang.cpp.old 2019-01-25 00:15:41.000000000 +0000 +++ cfe-8.0.0.src/lib/Driver/ToolChains/Clang.cpp 2019-06-01 23:19:33.973868618 +0000 -@@ -1745,7 +1745,7 @@ +@@ -1751,7 +1751,7 @@ break; } diff --git a/user/clang/secure-plt.patch b/user/clang/secure-plt.patch index a92071e52..670e845c2 100644 --- a/user/clang/secure-plt.patch +++ b/user/clang/secure-plt.patch @@ -4,8 +4,8 @@ const ArgList &Args) { if (Args.getLastArg(options::OPT_msecure_plt)) return ppc::ReadGOTPtrMode::SecurePlt; -- if (Triple.isOSOpenBSD()) -+ if (Triple.isOSOpenBSD() || Triple.isMusl()) +- if (Triple.isOSNetBSD() || Triple.isOSOpenBSD()) ++ if (Triple.isOSNetBSD() || Triple.isOSOpenBSD() || Triple.isMusl()) return ppc::ReadGOTPtrMode::SecurePlt; else return ppc::ReadGOTPtrMode::Bss; diff --git a/user/clang/use-llvm-lit.patch b/user/clang/use-llvm-lit.patch index 0cbb84835..f5e10d9d6 100644 --- a/user/clang/use-llvm-lit.patch +++ b/user/clang/use-llvm-lit.patch @@ -1,6 +1,6 @@ --- cfe-6.0.1.src/test/CMakeLists.txt.old 2017-12-12 19:47:40.000000000 +0000 +++ cfe-6.0.1.src/test/CMakeLists.txt 2018-09-13 17:01:03.690000000 +0000 -@@ -115,7 +115,7 @@ +@@ -126,7 +126,7 @@ add_lit_testsuite(check-clang "Running the Clang regression tests" ${CMAKE_CURRENT_BINARY_DIR} |