summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormarco442021-06-23 11:25:21 +0200
committermarco442021-06-23 11:25:21 +0200
commitbf06f02c7406e955ae11e6512aa04721eabb8835 (patch)
tree69d4d0518e92da2ea8cb908b18f2d8481138b643
parent6d6be1095b67745c4aa1f3e29c47af9abfc15de8 (diff)
downloadaur-bf06f02c7406e955ae11e6512aa04721eabb8835.tar.gz
Revert "Use GCC 10 temporarily"
This reverts commit 6d6be1095b67745c4aa1f3e29c47af9abfc15de8.
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD7
2 files changed, 2 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2f1cec3d389..44cdf2410c91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,6 @@ pkgbase = darktable-git
makedepends = clang
makedepends = python-jsonschema
makedepends = libwebp
- makedepends = gcc10
depends = pugixml
depends = libjpeg-turbo
depends = colord-gtk
diff --git a/PKGBUILD b/PKGBUILD
index 12c35874a49e..68bd913c045b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,8 +20,7 @@ optdepends=('dcraw: base curve script'
'imagemagick: base curve and noise profile scripts'
'ghostscript: noise profile script'
'gnuplot: noise profile script')
-# Temporarily depend on gcc10: https://github.com/darktable-org/darktable/issues/9002
-makedepends=(git cmake intltool desktop-file-utils llvm clang python-jsonschema libwebp gcc10)
+makedepends=(git cmake intltool desktop-file-utils llvm clang python-jsonschema libwebp)
conflicts=(darktable)
provides=(darktable)
install=darktable.install
@@ -70,9 +69,7 @@ build() {
-DUSE_COLORD=ON \
-DBUILD_CURVE_TOOLS=ON \
-DBUILD_NOISE_TOOLS=ON \
- -DRAWSPEED_ENABLE_LTO=ON \
- -DCMAKE_C_COMPILER=/usr/bin/gcc-10 \
- -DCMAKE_CXX_COMPILER=/usr/bin/g++-10
+ -DRAWSPEED_ENABLE_LTO=ON
make -C build
}