[arch-commits] Commit in crystal/trunk (PKGBUILD llvm7.patch)
Date: Friday, September 21, 2018 @ 02:49:10
Author: foutrelis
Revision: 383803
Remove patch added in previous commit; it's incomplete
Modified:
crystal/trunk/PKGBUILD
Deleted:
crystal/trunk/llvm7.patch
-+
PKGBUILD|5 -
llvm7.patch | 281 --
2 files changed, 286 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-21 02:03:55 UTC (rev 383802)
+++ PKGBUILD2018-09-21 02:49:10 UTC (rev 383803)
@@ -16,11 +16,9 @@
'gmp: For BigInt support'
'libxml2: For XML support')
source=(crystal-$pkgver.tar.gz::https://github.com/crystal-lang/crystal/archive/$pkgver.tar.gz
-llvm7.patch
fix_build.patch::https://github.com/crystal-lang/crystal/commit/b697de03deed7647a7bebe0e0987cb660854bdac.patch
fix_openssl_11.patch::https://github.com/crystal-lang/crystal/commit/e7524159ef48fe47df914b3c0c1716c602a8bbd8.patch)
sha256sums=('b7c755a7d0f49f572ae5c08b8b0139fcb1c6862c9479dfae74f00e2c8424fcb0'
-'8c0c5e2a33d3d9d74db7c27a8a6d7e9ddb5bac7d61490372b037cead4664f18a'
'4f42a13ade130495e683261c5c200112dbb3f56c125dbada7533717393c69138'
'6ce3967052f6ac7e6f0a738782369a375310b5c2650fe1ac95e77408d268e24a')
@@ -33,9 +31,6 @@
# https://github.com/crystal-lang/crystal/pull/6738
patch -p1 < ../fix_openssl_11.patch
-
- # https://github.com/crystal-lang/crystal/issues/6754
- patch -p1 < ../llvm7.patch
}
build() {
Deleted: llvm7.patch
===
--- llvm7.patch 2018-09-21 02:03:55 UTC (rev 383802)
+++ llvm7.patch 2018-09-21 02:49:10 UTC (rev 383803)
@@ -1,281 +0,0 @@
-From 96380373229306a27eda49f5bfe67538a2589359 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras
-Date: Fri, 21 Sep 2018 04:38:46 +0300
-Subject: [PATCH] Fix building with LLVM 7 (#6754)
-
-Similarly to how LLVM 6 support was added in commit 249a2ed4dae7:
-
-- Rename functions that conflict with those added to llvm-c/DebugInfo.h
- in LLVM 7
-- Pass a reference to a module to the bitcode writer (ref LLVM r325155)
- src/llvm/ext/llvm_ext.cc | 36
- src/llvm/lib_llvm.cr | 1 +
- src/llvm/lib_llvm_ext.cr | 30 +++---
- 3 files changed, 36 insertions(+), 31 deletions(-)
-
-diff --git a/src/llvm/ext/llvm_ext.cc b/src/llvm/ext/llvm_ext.cc
-index e6c5744bf..12746f2d6 100644
a/src/llvm/ext/llvm_ext.cc
-+++ b/src/llvm/ext/llvm_ext.cc
-@@ -86,7 +86,7 @@ LLVMMetadataRef LLVMDIBuilderCreateCompileUnit2(DIBuilderRef
Dref, unsigned Lang
- #endif
- }
-
--LLVMMetadataRef LLVMDIBuilderCreateFunction(
-+LLVMMetadataRef LLVMDIBuilderCreateFunction2(
- DIBuilderRef Dref, LLVMMetadataRef Scope, const char *Name,
- const char *LinkageName, LLVMMetadataRef File, unsigned Line,
- LLVMMetadataRef CompositeType, bool IsLocalToUnit, bool IsDefinition,
-@@ -106,7 +106,7 @@ LLVMMetadataRef LLVMDIBuilderCreateFunction(
- return wrap(Sub);
- }
-
--LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock(DIBuilderRef Dref,
-+LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock2(DIBuilderRef Dref,
- LLVMMetadataRef Scope,
- LLVMMetadataRef File,
- unsigned Line,
-@@ -115,7 +115,7 @@ LLVMMetadataRef
LLVMDIBuilderCreateLexicalBlock(DIBuilderRef Dref,
-unwrapDI(File), Line, Column));
- }
-
--LLVMMetadataRef LLVMDIBuilderCreateBasicType(DIBuilderRef Dref,
-+LLVMMetadataRef LLVMDIBuilderCreateBasicType2(DIBuilderRef Dref,
- const char *Name,
- uint64_t SizeInBits,
- uint64_t AlignInBits,
-@@ -127,7 +127,7 @@ LLVMMetadataRef LLVMDIBuilderCreateBasicType(DIBuilderRef
Dref,
- #endif
- }
-
--LLVMMetadataRef LLVMDIBuilderGetOrCreateTypeArray(DIBuilderRef Dref,
-+LLVMMetadataRef LLVMDIBuilderGetOrCreateTypeArray2(DIBuilderRef Dref,
- LLVMMetadataRef *Data,
- unsigned Length) {
- Metadata **DataValue = unwrap(Data);
-@@ -136,7 +136,7 @@ LLVMMetadataRef
LLVMDIBuilderGetOrCreateTypeArray(DIBuilderRef Dref,
- .get());
- }
-
--LLVMMetadataRef LLVMDIBuilderGetOrCreateArray(DIBuilderRef Dref,
-+LLVMMetadataRef LLVMDIBuilderGetOrCreateArray2(DIBuilderRef Dref,
- LLVMMetadataRef *Data,
- unsigned Length) {
- Metadata **DataValue = unwrap(Data);
-@@ -145,13 +145,13 @@ LLVMMetadataRef
LLVMDIBuilderGetOrCreateArray(DIBuilderRef Dref,
- }
-
- LLVMMetadataRef
--LLVMDIBuilderCreateSubroutineType(DIBuilderRef Dref,
[arch-commits] Commit in crystal/trunk (PKGBUILD llvm7.patch)
Date: Friday, September 21, 2018 @ 02:01:26
Author: foutrelis
Revision: 383800
LLVM 7 rebuild
Added:
crystal/trunk/llvm7.patch
Modified:
crystal/trunk/PKGBUILD
-+
PKGBUILD|7 +
llvm7.patch | 281 ++
2 files changed, 287 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-21 01:33:46 UTC (rev 383799)
+++ PKGBUILD2018-09-21 02:01:26 UTC (rev 383800)
@@ -3,7 +3,7 @@
pkgname=crystal
pkgver=0.26.1
-pkgrel=2
+pkgrel=3
pkgdesc='The Crystal Programming Language'
arch=(x86_64)
url='http://crystal-lang.org'
@@ -16,9 +16,11 @@
'gmp: For BigInt support'
'libxml2: For XML support')
source=(crystal-$pkgver.tar.gz::https://github.com/crystal-lang/crystal/archive/$pkgver.tar.gz
+llvm7.patch
fix_build.patch::https://github.com/crystal-lang/crystal/commit/b697de03deed7647a7bebe0e0987cb660854bdac.patch
fix_openssl_11.patch::https://github.com/crystal-lang/crystal/commit/e7524159ef48fe47df914b3c0c1716c602a8bbd8.patch)
sha256sums=('b7c755a7d0f49f572ae5c08b8b0139fcb1c6862c9479dfae74f00e2c8424fcb0'
+'8c0c5e2a33d3d9d74db7c27a8a6d7e9ddb5bac7d61490372b037cead4664f18a'
'4f42a13ade130495e683261c5c200112dbb3f56c125dbada7533717393c69138'
'6ce3967052f6ac7e6f0a738782369a375310b5c2650fe1ac95e77408d268e24a')
@@ -31,6 +33,9 @@
# https://github.com/crystal-lang/crystal/pull/6738
patch -p1 < ../fix_openssl_11.patch
+
+ # https://github.com/crystal-lang/crystal/issues/6754
+ patch -p1 < ../llvm7.patch
}
build() {
Added: llvm7.patch
===
--- llvm7.patch (rev 0)
+++ llvm7.patch 2018-09-21 02:01:26 UTC (rev 383800)
@@ -0,0 +1,281 @@
+From 96380373229306a27eda49f5bfe67538a2589359 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras
+Date: Fri, 21 Sep 2018 04:38:46 +0300
+Subject: [PATCH] Fix building with LLVM 7 (#6754)
+
+Similarly to how LLVM 6 support was added in commit 249a2ed4dae7:
+
+- Rename functions that conflict with those added to llvm-c/DebugInfo.h
+ in LLVM 7
+- Pass a reference to a module to the bitcode writer (ref LLVM r325155)
+---
+ src/llvm/ext/llvm_ext.cc | 36
+ src/llvm/lib_llvm.cr | 1 +
+ src/llvm/lib_llvm_ext.cr | 30 +++---
+ 3 files changed, 36 insertions(+), 31 deletions(-)
+
+diff --git a/src/llvm/ext/llvm_ext.cc b/src/llvm/ext/llvm_ext.cc
+index e6c5744bf..12746f2d6 100644
+--- a/src/llvm/ext/llvm_ext.cc
b/src/llvm/ext/llvm_ext.cc
+@@ -86,7 +86,7 @@ LLVMMetadataRef LLVMDIBuilderCreateCompileUnit2(DIBuilderRef
Dref, unsigned Lang
+ #endif
+ }
+
+-LLVMMetadataRef LLVMDIBuilderCreateFunction(
++LLVMMetadataRef LLVMDIBuilderCreateFunction2(
+ DIBuilderRef Dref, LLVMMetadataRef Scope, const char *Name,
+ const char *LinkageName, LLVMMetadataRef File, unsigned Line,
+ LLVMMetadataRef CompositeType, bool IsLocalToUnit, bool IsDefinition,
+@@ -106,7 +106,7 @@ LLVMMetadataRef LLVMDIBuilderCreateFunction(
+ return wrap(Sub);
+ }
+
+-LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock(DIBuilderRef Dref,
++LLVMMetadataRef LLVMDIBuilderCreateLexicalBlock2(DIBuilderRef Dref,
+ LLVMMetadataRef Scope,
+ LLVMMetadataRef File,
+ unsigned Line,
+@@ -115,7 +115,7 @@ LLVMMetadataRef
LLVMDIBuilderCreateLexicalBlock(DIBuilderRef Dref,
+unwrapDI(File), Line, Column));
+ }
+
+-LLVMMetadataRef LLVMDIBuilderCreateBasicType(DIBuilderRef Dref,
++LLVMMetadataRef LLVMDIBuilderCreateBasicType2(DIBuilderRef Dref,
+ const char *Name,
+ uint64_t SizeInBits,
+ uint64_t AlignInBits,
+@@ -127,7 +127,7 @@ LLVMMetadataRef LLVMDIBuilderCreateBasicType(DIBuilderRef
Dref,
+ #endif
+ }
+
+-LLVMMetadataRef LLVMDIBuilderGetOrCreateTypeArray(DIBuilderRef Dref,
++LLVMMetadataRef LLVMDIBuilderGetOrCreateTypeArray2(DIBuilderRef Dref,
+ LLVMMetadataRef *Data,
+ unsigned Length) {
+ Metadata **DataValue = unwrap(Data);
+@@ -136,7 +136,7 @@ LLVMMetadataRef
LLVMDIBuilderGetOrCreateTypeArray(DIBuilderRef Dref,
+ .get());
+ }
+
+-LLVMMetadataRef LLVMDIBuilderGetOrCreateArray(DIBuilderRef Dref,
++LLVMMetadataRef LLVMDIBuilderGetOrCreateArray2(DIBuilderRef Dref,
+ LLVMMetadataRef *Data,
+ unsigned Length) {
+ Metadata **DataValue = unwrap(Data);
+@@ -145,13 +145,13 @@ LLVMMetadataRef
