Accepting request 1179408 from devel:tools:compiler

- Update patchsets for llvm18 changes
  ./0000-remove-lld-in-cmakelist.patch
  ./0001-invoke-lld.patch
- Update to version 0.13.0:
  ** CHANGELOG TOO LONG **
  See https://ziglang.org/download/0.12.0/release-notes.html
  * Release focuses more on the LLVM18 support

OBS-URL: https://build.opensuse.org/request/show/1179408
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zig?expand=0&rev=7

0000-remove-lld-in-cmakelist.patch

@@ -1,32 +1,26 @@
-We invoke LLD so we also commented/remove it out as well.
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 92be8fb..e19d18e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,7 +136,7 @@
+diff -ruN zig-0.13.0.orig/CMakeLists.txt zig-0.13.0/CMakeLists.txt
+--- zig-0.13.0.orig/CMakeLists.txt	2024-06-08 02:06:52.784489192 +0800
++++ zig-0.13.0/CMakeLists.txt	2024-06-08 02:07:26.458213443 +0800
+@@ -139,7 +139,7 @@
  
- find_package(llvm 17)
- find_package(clang 17)
--find_package(lld 17)
-+# find_package(lld 17)
+ find_package(llvm 18)
+ find_package(clang 18)
+-find_package(lld 18)
++# find_package(lld 18)
  
  if(ZIG_STATIC_ZLIB)
      if (MSVC)
-@@ -183,7 +183,7 @@
- endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES)
- 
- include_directories(${LLVM_INCLUDE_DIRS})
--include_directories(${LLD_INCLUDE_DIRS})
-+# include_directories(${LLD_INCLUDE_DIRS})
- include_directories(${CLANG_INCLUDE_DIRS})
- 
- find_package(Threads)
-@@ -707,7 +707,7 @@
- 
- target_link_libraries(zigcpp LINK_PUBLIC
+@@ -736,11 +736,11 @@
+ target_include_directories(zigcpp PUBLIC
+     ${CLANG_INCLUDE_DIRS}
+     ${LLVM_INCLUDE_DIRS}
+-    ${LLD_INCLUDE_DIRS}
++#    ${LLD_INCLUDE_DIRS}
+ )
+ target_link_libraries(zigcpp PUBLIC
      ${CLANG_LIBRARIES}
 -    ${LLD_LIBRARIES}
-+    # ${LLD_LIBRARIES}
++#    ${LLD_LIBRARIES}
      ${LLVM_LIBRARIES}
      ${CMAKE_THREAD_LIBS_INIT}
  )

0001-invoke-lld.patch

@@ -116,19 +116,19 @@ index ae1f0242..c0010c77 100644
  bool ZigLLDLinkCOFF(int argc, const char **argv, bool can_exit_early, bool disable_output) {
 -    std::vector<const char *> args(argv, argv + argc);
 -    return lld::coff::link(args, llvm::outs(), llvm::errs(), can_exit_early, disable_output);
-+    return InvokeLld("lld-link-17", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output);
++    return InvokeLld("lld-link-18", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output);
  }
  
  bool ZigLLDLinkELF(int argc, const char **argv, bool can_exit_early, bool disable_output) {
 -    std::vector<const char *> args(argv, argv + argc);
 -    return lld::elf::link(args, llvm::outs(), llvm::errs(), can_exit_early, disable_output);
-+    return InvokeLld("ld.lld-17", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output);
++    return InvokeLld("ld.lld-18", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output);
  }
  
  bool ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early, bool disable_output) {
 -    std::vector<const char *> args(argv, argv + argc);
 -    return lld::wasm::link(args, llvm::outs(), llvm::errs(), can_exit_early, disable_output);
-+    return InvokeLld("wasm-ld-17", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output);
++    return InvokeLld("wasm-ld-18", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output);
  }
  
  static_assert((Triple::ArchType)ZigLLVM_UnknownArch == Triple::UnknownArch, "");

zig-0.12.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6744ef84b6716f976dad923075b2f54dc4f785f200ae6c8ea07997bd9d9bd9a
-size 17099152

zig-0.13.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06c73596beeccb71cc073805bdb9c0e05764128f16478fa53bf17dfabc1d4318
+size 17220728

zig.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Jun  7 17:56:48 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
+
+- Update patchsets for llvm18 changes
+  ./0000-remove-lld-in-cmakelist.patch
+  ./0001-invoke-lld.patch
+
+-------------------------------------------------------------------
+Fri Jun  7 17:35:24 UTC 2024 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
+
+- Update to version 0.13.0:
+  ** CHANGELOG TOO LONG **
+  See https://ziglang.org/download/0.12.0/release-notes.html
+  * Release focuses more on the LLVM18 support
+
 -------------------------------------------------------------------
 Sat May  4 15:13:58 UTC 2024 - Michael Burge <michael.burge77@gmail.com>
 

zig.spec

@@ -22,7 +22,7 @@
 %bcond_without  test
 
 Name:           zig
-Version:        0.12.0
+Version:        0.13.0
 Release:        0
 Summary:        Compiler for the Zig language
 License:        MIT
@@ -34,19 +34,19 @@ Source2:        zig-rpmlintrc
 Patch0:         0000-remove-lld-in-cmakelist.patch
 Patch1:         0001-invoke-lld.patch
 Patch2:         0002-no-lld-libs-and-includes.patch
-BuildRequires:  clang17
-BuildRequires:  clang17-devel
+BuildRequires:  clang18
+BuildRequires:  clang18-devel
 BuildRequires:  cmake
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  glibc
 BuildRequires:  glibc-devel
 BuildRequires:  help2man
-BuildRequires:  lld17
-BuildRequires:  llvm17-devel
+BuildRequires:  lld18
+BuildRequires:  llvm18-devel
 BuildRequires:  ninja
 BuildRequires:  zlib-devel
-Requires:       lld17
+Requires:       lld18
 
 # llvm-config is missing targets for ppc and arm architectures.
 # ExcludeArch:    ppc64 ppc64le %%arm %%ix86
@@ -95,8 +95,8 @@ This package contains common RPM macros for %{name}.
   -DCMAKE_BUILD_TYPE=Release \
 %endif
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  -DCMAKE_C_COMPILER="clang-17" \
-  -DCMAKE_CXX_COMPILER="clang++-17" \
+  -DCMAKE_C_COMPILER="clang-18" \
+  -DCMAKE_CXX_COMPILER="clang++-18" \
   -DZIG_SHARED_LLVM=On \
   -DZIG_TARGET_MCPU="baseline" \
   -DZIG_VERSION:STRING="%{version}"