From f27ce3f0762820b2d81a8557237cc865c24a1124 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 25 Aug 2017 10:13:53 +0200
Subject: community/cringo: fixed building with g++ instead of clang++

---
 community/clingo/PKGBUILD | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 community/clingo/PKGBUILD

(limited to 'community/clingo/PKGBUILD')

diff --git a/community/clingo/PKGBUILD b/community/clingo/PKGBUILD
new file mode 100644
index 00000000..362b9ad9
--- /dev/null
+++ b/community/clingo/PKGBUILD
@@ -0,0 +1,15 @@
+# clang++ misses some C++ atomic stubs in the C++ library on 32-bit,
+# g++ compiles and links fine
+# also reported upstream: https://github.com/potassco/clingo/issues/57
+
+# cmake
+makedepends=(${makedepends[@]/clang})
+
+# must be patched after cmake has run, hence it is in build
+eval "$(
+  declare -f build | \
+    sed '
+	  s/-DCMAKE_CXX_COMPILER=clang++/-DCMAKE_CXX_COMPILER=g++/
+      /^\s*ninja\s*/i  sed -i s/clang++/g++/g ${srcdir}/build/rules.ninja
+    '
+)"
-- 
cgit v1.2.3-70-g09d2


From 5521dbd7d889b9bdcfc546d3d14f5d810ff9b0a4 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 26 Aug 2017 14:20:17 +0200
Subject: community/cringo: fixed compilation using -latomic patch from
 upstream

---
 community/clingo/PKGBUILD | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'community/clingo/PKGBUILD')

diff --git a/community/clingo/PKGBUILD b/community/clingo/PKGBUILD
index 362b9ad9..707701db 100644
--- a/community/clingo/PKGBUILD
+++ b/community/clingo/PKGBUILD
@@ -1,15 +1,10 @@
-# clang++ misses some C++ atomic stubs in the C++ library on 32-bit,
-# g++ compiles and links fine
-# also reported upstream: https://github.com/potassco/clingo/issues/57
+# see upstream: https://github.com/potassco/clingo/issues/57
 
-# cmake
-makedepends=(${makedepends[@]/clang})
+arch+=('i686')
+source+=("clang-libatomic.patch::https://github.com/potassco/clasp/commit/fe3e176e2813956000bb947479de2c3d80fe34be.patch")
+sha256sums+=('222b535ffd761c07c3652a3025180bcfb1f1b7504d7353048d5ce485a84c1a27')
 
-# must be patched after cmake has run, hence it is in build
-eval "$(
-  declare -f build | \
-    sed '
-	  s/-DCMAKE_CXX_COMPILER=clang++/-DCMAKE_CXX_COMPILER=g++/
-      /^\s*ninja\s*/i  sed -i s/clang++/g++/g ${srcdir}/build/rules.ninja
-    '
-)"
+prepare() {
+  cd $pkgname-$pkgver/clasp
+  patch -p1 -i ../../clang-libatomic.patch
+}
-- 
cgit v1.2.3-70-g09d2


From aaa6b6d13d4322067b3baf53676e5c7656844058 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 26 Aug 2017 14:22:30 +0200
Subject: community/cringo: removed i686 in PKGBUILD

---
 community/clingo/PKGBUILD | 1 -
 1 file changed, 1 deletion(-)

(limited to 'community/clingo/PKGBUILD')

diff --git a/community/clingo/PKGBUILD b/community/clingo/PKGBUILD
index 707701db..cf5c4a59 100644
--- a/community/clingo/PKGBUILD
+++ b/community/clingo/PKGBUILD
@@ -1,6 +1,5 @@
 # see upstream: https://github.com/potassco/clingo/issues/57
 
-arch+=('i686')
 source+=("clang-libatomic.patch::https://github.com/potassco/clasp/commit/fe3e176e2813956000bb947479de2c3d80fe34be.patch")
 sha256sums+=('222b535ffd761c07c3652a3025180bcfb1f1b7504d7353048d5ce485a84c1a27')
 
-- 
cgit v1.2.3-70-g09d2