summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Graef2020-06-20 08:47:40 +0200
committerAlbert Graef2020-06-20 08:47:40 +0200
commitc1c632ff23bb5b368ca5eacdbdafa6a0311fdf4f (patch)
treea1654c79e1f0932ec9a5f9fe2e1b2fb1880a8dce
parent6ddcff4bf31ae92f9af694ba6c4dda4e1f3cf8a1 (diff)
downloadaur-c1c632ff23bb5b368ca5eacdbdafa6a0311fdf4f.tar.gz
Fix gcc10 compilation issues.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD7
-rw-r--r--gcc10.patch11
3 files changed, 22 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 01bdb7e2456f..0b622f225f08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = llvm35
pkgver = 3.5.2
- pkgrel = 6
+ pkgrel = 7
url = http://llvm.org/
arch = x86_64
license = custom:University of Illinois/NCSA Open Source License
@@ -11,19 +11,21 @@ pkgbase = llvm35
source = https://releases.llvm.org/3.5.2/cfe-3.5.2.src.tar.xz
source = llvm-3.5.0-force-link-pass.o.patch
source = gcc5.patch
+ source = gcc10.patch
source = llvm-Config-config.h
source = llvm-Config-llvm-config.h
sha256sums = 44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575
sha256sums = 4feb575f74fb3a74b6245400460230141bf610f235ef3a25008cfe6137828620
sha256sums = 5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19
sha256sums = c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2
+ sha256sums = 75bfba16c3bf6fd4fc3d4807969f64a68e5259ca6d15b560333cdac9baf09df2
sha256sums = 312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3
sha256sums = 597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48
makedepends_x86_64 = gcc-multilib
pkgname = llvm35
pkgdesc = Low Level Virtual Machine
- depends = llvm35-libs=3.5.2-6
+ depends = llvm35-libs=3.5.2-7
depends = perl
conflicts = llvm
@@ -38,7 +40,7 @@ pkgname = llvm35-libs
pkgname = clang35
pkgdesc = C language family frontend for LLVM
url = http://clang.llvm.org/
- depends = llvm35-libs=3.5.2-6
+ depends = llvm35-libs=3.5.2-7
depends = gcc
optdepends = llvm-libs: for compiling with -flto
conflicts = clang
diff --git a/PKGBUILD b/PKGBUILD
index 00661c727139..c1c0419e84dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@
pkgbase=llvm35
pkgname=('llvm35' 'llvm35-libs' 'clang35')
pkgver=3.5.2
-pkgrel=6
+pkgrel=7
arch=('x86_64')
url="http://llvm.org/"
license=('custom:University of Illinois/NCSA Open Source License')
@@ -42,6 +42,7 @@ source=(https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz
#https://releases.llvm.org/$pkgver/compiler-rt-$pkgver.src.tar.xz
llvm-3.5.0-force-link-pass.o.patch
gcc5.patch
+ gcc10.patch
llvm-Config-config.h
llvm-Config-llvm-config.h)
sha256sums=('44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575'
@@ -49,6 +50,7 @@ sha256sums=('44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575'
#'542d7aadd21e7fe35bea0a7912bc965f08a1a566746cebcca76f96dcfeb74dc3'
'5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19'
'c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2'
+ '75bfba16c3bf6fd4fc3d4807969f64a68e5259ca6d15b560333cdac9baf09df2'
'312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
'597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
@@ -77,6 +79,9 @@ prepare() {
# Fix build with GCC 5.1
# http://llvm.org/viewvc/llvm-project?view=revision&revision=218295
patch -Np0 -i ../gcc5.patch
+
+ # -fvisibility-inlines-hidden breaks the build with GCC 10
+ patch -Np0 -i ../gcc10.patch
}
build() {
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 000000000000..20c027cfe616
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,11 @@
+--- Makefile.config.in.orig 2020-06-20 01:07:02.000000000 +0200
++++ Makefile.config.in 2020-06-20 01:08:51.501705109 +0200
+@@ -336,7 +336,7 @@
+ ENABLE_EMBED_STDCXX := @ENABLE_EMBED_STDCXX@
+
+ # Use -fvisibility-inlines-hidden?
+-ENABLE_VISIBILITY_INLINES_HIDDEN := @ENABLE_VISIBILITY_INLINES_HIDDEN@
++ENABLE_VISIBILITY_INLINES_HIDDEN := 0
+
+ # Do we want to allow timestamping information into builds?
+ ENABLE_TIMESTAMPS := @ENABLE_TIMESTAMPS@