Commit: 7712e6e79f1910feaedf6a603247dba03dbec963 - remislackbuilds (hg)

Remilia's SlackBuild packages for Slackware Linux

Commit MetaInfo

• Revision: 7712e6e79f1910feaedf6a603247dba03dbec963 (tree)
• Time: 2023-06-13 07:26:06
• Author: Remilia Scarlet <alexa@part...>
• Commiter: Remilia Scarlet

Log Message

Add a patch to support LLVM 16.

This is already in the upstream code, and will not be needed for 1.9
and later. But for 1.8.2, it's required, otherwise Crystal will not
build.

Change Summary

• modified: development/crystal-lang/crystal-lang.SlackBuild
• add: development/crystal-lang/support-llvm-16.patch

Incremental Difference

diff -r 72a409e25b38 -r 7712e6e79f19 development/crystal-lang/crystal-lang.SlackBuild
--- a/development/crystal-lang/crystal-lang.SlackBuild	Mon Jun 12 11:20:27 2023 -0600
+++ b/development/crystal-lang/crystal-lang.SlackBuild	Mon Jun 12 16:26:06 2023 -0600
@@ -97,6 +97,10 @@
 # Change the path so that we use the pre-compiled binary for bootstrapping.
 PATH="$PRGNAM_SHORT-$PRECOMP_VERSION-$PRECOMP_ARCH-$PRECOMP_SUFFIX/bin:$PATH"
 
+# Patch from upstream to support LLVM 16, which will be in Crystal >= 1.9, but
+# not in 1.8.2
+patch -p1 < $CWD/support-llvm-16.patch
+
 # Build the compiler
 CFLAGS="$SLKCFLAGS" \
   make release=1 progress=1 interpreter=1

diff -r 72a409e25b38 -r 7712e6e79f19 development/crystal-lang/support-llvm-16.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/development/crystal-lang/support-llvm-16.patch	Mon Jun 12 16:26:06 2023 -0600
@@ -0,0 +1,29 @@
+diff -u -r ./src/llvm/ext/llvm-versions.txt ../new/src/llvm/ext/llvm-versions.txt
+--- ./src/llvm/ext/llvm-versions.txt	2023-05-09 02:52:26.000000000 -0600
++++ ./src/llvm/ext/llvm-versions.txt	2023-06-12 16:21:37.411411241 -0600
+@@ -1 +1 @@
+-15.0 14.0 13.0 12.0 11.1 11.0 10.0 9.0 8.0
++16.0 15.0 14.0 13.0 12.0 11.1 11.0 10.0 9.0 8.0
+diff -u -r ./src/llvm/ext/llvm_ext.cc ../new/src/llvm/ext/llvm_ext.cc
+--- ./src/llvm/ext/llvm_ext.cc	2023-05-09 02:52:26.000000000 -0600
++++ .w/src/llvm/ext/llvm_ext.cc	2023-06-12 16:21:24.943165258 -0600
+@@ -25,6 +25,10 @@
+ #include <llvm/Bitcode/BitcodeWriter.h>
+ #include <llvm/Analysis/ModuleSummaryAnalysis.h>
+ 
++#if LLVM_VERSION_GE(16, 0)
++#define makeArrayRef ArrayRef
++#endif
++
+ typedef DIBuilder *DIBuilderRef;
+ #define DIArray DINodeArray
+ template <typename T> T *unwrapDIptr(LLVMMetadataRef v) {
+@@ -358,7 +362,7 @@
+          .setOptLevel((CodeGenOpt::Level)options.OptLevel)
+          .setTargetOptions(targetOptions);
+   bool JIT;
+-  if (Optional<CodeModel::Model> CM = unwrap(options.CodeModel, JIT))
++  if (auto CM = unwrap(options.CodeModel, JIT))
+     builder.setCodeModel(*CM);
+   if (options.MCJMM)
+     builder.setMCJITMemoryManager(