aboutsummaryrefslogtreecommitdiff
path: root/unmaintained
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-04-11 17:31:53 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-04-11 17:31:53 -0300
commit4f142ee358e5ab191ef15b9c6edce6b307a27b85 (patch)
tree3eaa00e62e178a398cde24e173cd181765ca5b79 /unmaintained
parentfd53478e71c796a53c753b236ad82596a8920629 (diff)
downloadalpine_aports-4f142ee358e5ab191ef15b9c6edce6b307a27b85.tar.bz2
alpine_aports-4f142ee358e5ab191ef15b9c6edce6b307a27b85.tar.xz
alpine_aports-4f142ee358e5ab191ef15b9c6edce6b307a27b85.zip
unmaintained/clang6: remove
llvm6 was removed
Diffstat (limited to 'unmaintained')
-rw-r--r--unmaintained/clang6/0004-Add-musl-targets.patch84
-rw-r--r--unmaintained/clang6/0008-Fix-ClangConfig-cmake-LLVM-path.patch25
-rw-r--r--unmaintained/clang6/APKBUILD100
3 files changed, 0 insertions, 209 deletions
diff --git a/unmaintained/clang6/0004-Add-musl-targets.patch b/unmaintained/clang6/0004-Add-musl-targets.patch
deleted file mode 100644
index 04a370892a..0000000000
--- a/unmaintained/clang6/0004-Add-musl-targets.patch
+++ /dev/null
@@ -1,84 +0,0 @@
1From 8f14313cb2ee5221e481e292bcd066a473b1edb8 Mon Sep 17 00:00:00 2001
2From: Jakub Jirutka <jakub@jirutka.cz>
3Date: Sun, 16 Apr 2017 16:49:00 +0100
4Subject: [PATCH 4/7] Add musl targets
5
6---
7 lib/Driver/ToolChains/Gnu.cpp | 6 ++++--
8 lib/Driver/ToolChains/Linux.cpp | 15 ++++++++++++---
9 2 files changed, 16 insertions(+), 5 deletions(-)
10
11diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
12index 72a9f85..40ad3f5 100644
13--- a/lib/Driver/ToolChains/Gnu.cpp
14+++ b/lib/Driver/ToolChains/Gnu.cpp
15@@ -1917,7 +1917,8 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const {
16 case llvm::Triple::arm:
17 case llvm::Triple::thumb:
18 LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
19- if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF) {
20+ if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF ||
21+ TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
22 TripleAliases.append(begin(ARMHFTriples), end(ARMHFTriples));
23 } else {
24 TripleAliases.append(begin(ARMTriples), end(ARMTriples));
25@@ -1926,7 +1927,8 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const {
26 case llvm::Triple::armeb:
27 case llvm::Triple::thumbeb:
28 LibDirs.append(begin(ARMebLibDirs), end(ARMebLibDirs));
29- if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF) {
30+ if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF ||
31+ TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
32 TripleAliases.append(begin(ARMebHFTriples), end(ARMebHFTriples));
33 } else {
34 TripleAliases.append(begin(ARMebTriples), end(ARMebTriples));
35diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
36index 1201df6..9eea3f0 100644
37--- a/lib/Driver/ToolChains/Linux.cpp
38+++ b/lib/Driver/ToolChains/Linux.cpp
39@@ -54,7 +54,8 @@ static std::string getMultiarchTriple(const Driver &D,
40 // regardless of what the actual target triple is.
41 case llvm::Triple::arm:
42 case llvm::Triple::thumb:
43- if (TargetEnvironment == llvm::Triple::GNUEABIHF) {
44+ if (TargetEnvironment == llvm::Triple::GNUEABIHF ||
45+ TargetEnvironment == llvm::Triple::MuslEABIHF) {
46 if (D.getVFS().exists(SysRoot + "/lib/arm-linux-gnueabihf"))
47 return "arm-linux-gnueabihf";
48 } else {
49@@ -64,7 +65,8 @@ static std::string getMultiarchTriple(const Driver &D,
50 break;
51 case llvm::Triple::armeb:
52 case llvm::Triple::thumbeb:
53- if (TargetEnvironment == llvm::Triple::GNUEABIHF) {
54+ if (TargetEnvironment == llvm::Triple::GNUEABIHF ||
55+ TargetEnvironment == llvm::Triple::MuslEABIHF) {
56 if (D.getVFS().exists(SysRoot + "/lib/armeb-linux-gnueabihf"))
57 return "armeb-linux-gnueabihf";
58 } else {
59@@ -434,6 +436,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
60 ArchName = "armeb";
61 IsArm = true;
62 break;
63+ case llvm::Triple::ppc:
64+ ArchName = "powerpc";
65+ break;
66+ case llvm::Triple::x86:
67+ ArchName = "i386";
68+ break;
69 default:
70 ArchName = Triple.getArchName().str();
71 }
72@@ -644,7 +652,8 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
73 break;
74 case llvm::Triple::arm:
75 case llvm::Triple::thumb:
76- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
77+ if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF ||
78+ getTriple().getEnvironment() == llvm::Triple::MuslEABIHF)
79 MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
80 else
81 MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
82--
832.14.1
84
diff --git a/unmaintained/clang6/0008-Fix-ClangConfig-cmake-LLVM-path.patch b/unmaintained/clang6/0008-Fix-ClangConfig-cmake-LLVM-path.patch
deleted file mode 100644
index f1c1c24499..0000000000
--- a/unmaintained/clang6/0008-Fix-ClangConfig-cmake-LLVM-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From: Adeel <adeelbm@outlook.com>
2Date: Sun, 6 May 2018 10:22:00 +0200
3Subject: [PATCH] Fix ClangConfig.cmake to look for LLVM-Config.cmake in correct location
4
5This results in the following change in the generated ClangConfig.cmake:
6
7 find_package(LLVM REQUIRED CONFIG
8 - HINTS "${CLANG_INSTALL_PREFIX}/lib/cmake/llvm")
9 + HINTS "/usr/lib/llvm5/lib/cmake/llvm")
10
11This is needed e.g. for building lldb.
12
13See https://github.com/alpinelinux/aports/pull/2342 for more information.
14
15--- a/cmake/modules/CMakeLists.txt
16+++ b/cmake/modules/CMakeLists.txt
17@@ -39,7 +39,7 @@ foreach(p ${_count})
18 get_filename_component(CLANG_INSTALL_PREFIX \"\${CLANG_INSTALL_PREFIX}\" PATH)")
19 endforeach(p)
20 set(CLANG_CONFIG_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${CLANG_INSTALL_PACKAGE_DIR}")
21-set(CLANG_CONFIG_LLVM_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
22+set(CLANG_CONFIG_LLVM_CMAKE_DIR "${llvm_cmake_builddir}")
23 set(CLANG_CONFIG_EXPORTS_FILE "\${CLANG_CMAKE_DIR}/ClangTargets.cmake")
24 set(CLANG_CONFIG_INCLUDE_DIRS
25 "\${CLANG_INSTALL_PREFIX}/include"
diff --git a/unmaintained/clang6/APKBUILD b/unmaintained/clang6/APKBUILD
deleted file mode 100644
index 5d0810a454..0000000000
--- a/unmaintained/clang6/APKBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
1# Contributor Travis Tilley <ttilley@gmail.com>
2_pkgname=clang
3# Note: Update together with llvm.
4pkgver=6.0.1
5_majorver=${pkgver%%.*}
6pkgname=$_pkgname$_majorver
7pkgrel=1
8_llvmver=${pkgver%%.*}
9pkgdesc="A C language family front-end for LLVM"
10arch="all"
11url="https://clang.llvm.org/"
12license="UOI-NCSA"
13makedepends="
14 cmake
15 isl-dev
16 libedit-dev
17 libxml2-dev
18 libxml2-utils
19 llvm6-dev>=$_llvmver
20 llvm6-static>=$_llvmver
21 llvm6-test-utils>=$_llvmver
22 python3
23 "
24depends_dev="$pkgname=$pkgver-r$pkgrel"
25subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
26 $pkgname-analyzer::noarch"
27source="https://releases.llvm.org/$pkgver/cfe-$pkgver.src.tar.xz
28 0004-Add-musl-targets.patch
29 0008-Fix-ClangConfig-cmake-LLVM-path.patch
30 "
31builddir="$srcdir/cfe-$pkgver.src"
32
33prepare() {
34 default_prepare
35}
36
37build() {
38 mkdir -p "$builddir"/build
39 cd "$builddir"/build
40
41 cmake .. -Wno-dev \
42 -DCMAKE_BUILD_TYPE=MinSizeRel \
43 -DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \
44 -DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \
45 -DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS" \
46 -DCMAKE_INSTALL_PREFIX=/usr \
47 -DCMAKE_VERBOSE_MAKEFILE=OFF \
48 \
49 -DCLANG_VENDOR=Alpine \
50 -DCLANG_BUILD_EXAMPLES=OFF \
51 -DCLANG_INCLUDE_DOCS=ON \
52 -DCLANG_INCLUDE_TESTS=ON \
53 -DCLANG_PLUGIN_SUPPORT=ON \
54 -DLIBCLANG_BUILD_STATIC=ON \
55 -DLLVM_ENABLE_EH=ON \
56 -DLLVM_ENABLE_RTTI=ON \
57 -DLLVM_EXTERNAL_LIT=/usr/lib/llvm$_llvmver/bin/lit \
58 -DLLVM_CONFIG=/usr/bin/llvm6-config
59
60 make clang-tblgen
61 make
62}
63
64check() {
65 cd "$builddir"/build
66
67 lit -sv --param clang_site_config=$builddir/build/test/lib.site.cfg $builddir/build/test
68}
69
70package() {
71 cd "$builddir"/build
72
73 make DESTDIR="$pkgdir" install
74 install -m 644 lib/libclang.a "$pkgdir"/usr/lib
75}
76
77static() {
78 pkgdesc="Static libraries for clang"
79
80 mkdir -p "$subpkgdir"/usr/lib
81 mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
82}
83
84analyzer() {
85 pkgdesc="Clang source code analysis framework"
86 depends="$pkgname=$pkgver-r$pkgrel perl python3"
87
88 cd "$pkgdir"
89
90 mkdir -p "$subpkgdir"/usr/bin \
91 "$subpkgdir"/usr/libexec \
92 "$subpkgdir"/usr/share/
93 mv usr/bin/scan-* "$subpkgdir"/usr/bin/
94 mv usr/libexec/*-analyzer "$subpkgdir"/usr/libexec/
95 mv usr/share/scan-* "$subpkgdir"/usr/share/
96}
97
98sha512sums="f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9 cfe-6.0.1.src.tar.xz
993fc38a952999909bd6be608092102e11f9685e68241c7abea09ac5f12533896b3a4cd0741caaccfbeb29b1882769fe66fe654f3292005b2ae16a10ea015e42a8 0004-Add-musl-targets.patch
1009485fe4fd6182df543735ed8f4ce618693d0faeafa86d3f9574a6c7abf50978e2d56e0a94be3ed94d515cc937c388d66ceff1bbc9bb120d371b6d3e95340da00 0008-Fix-ClangConfig-cmake-LLVM-path.patch"