Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package zig for openSUSE:Factory checked in at 2024-05-06 17:53:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zig (Old) and /work/SRC/openSUSE:Factory/.zig.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zig" Mon May 6 17:53:25 2024 rev:6 rq:1171998 version:0.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/zig/zig.changes 2023-11-07 21:27:01.492985971 +0100 +++ /work/SRC/openSUSE:Factory/.zig.new.1880/zig.changes 2024-05-06 17:53:48.752309202 +0200 @@ -1,0 +2,8 @@ +Sat May 4 15:13:58 UTC 2024 - Michael Burge <michael.burg...@gmail.com> + +- Update to version 0.12.0: + ** CHANGELOG TOO LONG ** + See https://ziglang.org/download/0.12.0/release-notes.html +- Now requires llvm17, all patches and specfile updated accordingly + +------------------------------------------------------------------- Old: ---- zig-0.11.0.tar.xz New: ---- zig-0.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zig.spec ++++++ --- /var/tmp/diff_new_pack.1lJEp9/_old 2024-05-06 17:53:49.844349029 +0200 +++ /var/tmp/diff_new_pack.1lJEp9/_new 2024-05-06 17:53:49.844349029 +0200 @@ -1,7 +1,7 @@ # # spec file for package zig # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %bcond_without test Name: zig -Version: 0.11.0 +Version: 0.12.0 Release: 0 Summary: Compiler for the Zig language License: MIT @@ -34,19 +34,19 @@ Patch0: 0000-remove-lld-in-cmakelist.patch Patch1: 0001-invoke-lld.patch Patch2: 0002-no-lld-libs-and-includes.patch -BuildRequires: clang16 -BuildRequires: clang16-devel +BuildRequires: clang17 +BuildRequires: clang17-devel BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc BuildRequires: glibc-devel BuildRequires: help2man -BuildRequires: lld16 -BuildRequires: llvm16-devel +BuildRequires: lld17 +BuildRequires: llvm17-devel BuildRequires: ninja BuildRequires: zlib-devel -Requires: lld16 +Requires: lld17 # llvm-config is missing targets for ppc and arm architectures. # ExcludeArch: ppc64 ppc64le %%arm %%ix86 @@ -95,8 +95,8 @@ -DCMAKE_BUILD_TYPE=Release \ %endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_C_COMPILER="clang-16" \ - -DCMAKE_CXX_COMPILER="clang++-16" \ + -DCMAKE_C_COMPILER="clang-17" \ + -DCMAKE_CXX_COMPILER="clang++-17" \ -DZIG_SHARED_LLVM=On \ -DZIG_TARGET_MCPU="baseline" \ -DZIG_VERSION:STRING="%{version}" ++++++ 0000-remove-lld-in-cmakelist.patch ++++++ --- /var/tmp/diff_new_pack.1lJEp9/_old 2024-05-06 17:53:49.864349758 +0200 +++ /var/tmp/diff_new_pack.1lJEp9/_new 2024-05-06 17:53:49.868349904 +0200 @@ -1,20 +1,18 @@ -From: Soc Virnyl Estela <socvirnyl.est...@gmail.com> -Date: Fri, 04 Aug 2023 14:59:44 PST 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 -@@ -126,7 +126,7 @@ set(ZIG_PIE off CACHE BOOL "produce a position independent zig executable") +@@ -136,7 +136,7 @@ - find_package(llvm 16) - find_package(clang 16) --find_package(lld 16) -+# find_package(lld 16) + find_package(llvm 17) + find_package(clang 17) +-find_package(lld 17) ++# find_package(lld 17) if(ZIG_STATIC_ZLIB) if (MSVC) -@@ -173,7 +173,7 @@ foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES}) +@@ -183,7 +183,7 @@ endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES) include_directories(${LLVM_INCLUDE_DIRS}) @@ -23,7 +21,7 @@ include_directories(${CLANG_INCLUDE_DIRS}) find_package(Threads) -@@ -684,7 +684,7 @@ set_target_properties(zigcpp PROPERTIES COMPILE_FLAGS ${ZIGCPP_CXX_FLAGS}) +@@ -707,7 +707,7 @@ target_link_libraries(zigcpp LINK_PUBLIC ${CLANG_LIBRARIES} ++++++ 0001-invoke-lld.patch ++++++ --- /var/tmp/diff_new_pack.1lJEp9/_old 2024-05-06 17:53:49.880350341 +0200 +++ /var/tmp/diff_new_pack.1lJEp9/_new 2024-05-06 17:53:49.888350633 +0200 @@ -1,11 +1,9 @@ -From: Soc Virnyl Estela <socvirnyl.est...@gmail.com> -Date: Fri, 04 Aug 2023 14:55:02 PST Based on Aaron Puchert's <aaronpuch...@alice-dsl.net> patch. diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp -index d22bfc1..c6502f5 100644 +index ae1f0242..c0010c77 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp -@@ -66,18 +66,100 @@ +@@ -60,15 +60,18 @@ #include <llvm/Transforms/Utils/CanonicalizeAliases.h> #include <llvm/Transforms/Utils/NameAnonGlobals.h> @@ -22,9 +20,14 @@ +#include <spawn.h> +#include <sys/wait.h> +#include <unistd.h> ++ using namespace llvm; +@@ -78,6 +81,85 @@ static const bool assertions_on = true; + static const bool assertions_on = false; + #endif + +namespace { + class Pipe { + public: @@ -104,30 +107,29 @@ + return WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0; +} + -+ - void ZigLLVMInitializeLoopStrengthReducePass(LLVMPassRegistryRef R) { - initializeLoopStrengthReducePass(*unwrap(R)); - } -@@ -1375,18 +1457,15 @@ bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size + LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, const char *Triple, + const char *CPU, const char *Features, LLVMCodeGenOptLevel Level, LLVMRelocMode Reloc, + LLVMCodeModel CodeModel, bool function_sections, bool data_sections, ZigLLVMABIType float_abi, +@@ -558,18 +640,15 @@ namespace lld { } 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", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output); ++ return InvokeLld("lld-link-17", 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", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output); ++ return InvokeLld("ld.lld-17", 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", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output); ++ return InvokeLld("wasm-ld-17", llvm::ArrayRef<const char *>(argv, argc), llvm::outs(), llvm::errs(), disable_output); } - inline LLVMAttributeRef wrap(Attribute Attr) { + static_assert((Triple::ArchType)ZigLLVM_UnknownArch == Triple::UnknownArch, ""); ++++++ 0002-no-lld-libs-and-includes.patch ++++++ --- /var/tmp/diff_new_pack.1lJEp9/_old 2024-05-06 17:53:49.900351071 +0200 +++ /var/tmp/diff_new_pack.1lJEp9/_new 2024-05-06 17:53:49.904351217 +0200 @@ -1,45 +1,50 @@ -From: Soc Virnyl Estela <socvirnyl.est...@gmail.com> -Date: Fri, 04 Aug 2023 14:57:54 PST Since we patched it to invoke LLD directly, we will have to remove any mentions of LLD here. diff --git a/build.zig b/build.zig -index cb62d64..f9e0a6a 100644 +index 0e43b82f..14792f48 100644 --- a/build.zig +++ b/build.zig -@@ -612,12 +612,9 @@ fn addCmakeCfgOptionsToExe( +@@ -689,12 +689,12 @@ fn addCmakeCfgOptionsToExe( cfg.cmake_static_library_suffix, }), }) }); - assert(cfg.lld_include_dir.len != 0); - exe.addIncludePath(.{ .cwd_relative = cfg.lld_include_dir }); ++ // assert(cfg.lld_include_dir.len != 0); ++ // exe.addIncludePath(.{ .cwd_relative = cfg.lld_include_dir }); exe.addIncludePath(.{ .cwd_relative = cfg.llvm_include_dir }); exe.addLibraryPath(.{ .cwd_relative = cfg.llvm_lib_dir }); addCMakeLibraryList(exe, cfg.clang_libraries); - addCMakeLibraryList(exe, cfg.lld_libraries); ++ // addCMakeLibraryList(exe, cfg.lld_libraries); addCMakeLibraryList(exe, cfg.llvm_libraries); if (use_zig_libcxx) { -@@ -764,8 +761,6 @@ const CMakeConfig = struct { - cmake_static_library_prefix: []const u8, +@@ -862,8 +862,8 @@ const CMakeConfig = struct { cmake_static_library_suffix: []const u8, cxx_compiler: []const u8, + cxx_compiler_arg1: []const u8, - lld_include_dir: []const u8, - lld_libraries: []const u8, ++ // lld_include_dir: []const u8, ++ // lld_libraries: []const u8, clang_libraries: []const u8, llvm_lib_dir: []const u8, llvm_include_dir: []const u8, -@@ -829,8 +824,6 @@ fn parseConfigH(b: *std.Build, config_h_text: []const u8) ?CMakeConfig { - .cmake_static_library_prefix = undefined, +@@ -929,8 +929,8 @@ fn parseConfigH(b: *std.Build, config_h_text: []const u8) ?CMakeConfig { .cmake_static_library_suffix = undefined, .cxx_compiler = undefined, + .cxx_compiler_arg1 = "", - .lld_include_dir = undefined, - .lld_libraries = undefined, ++ // .lld_include_dir = undefined, ++ // .lld_libraries = undefined, .clang_libraries = undefined, .llvm_lib_dir = undefined, .llvm_include_dir = undefined, -@@ -859,14 +852,6 @@ fn parseConfigH(b: *std.Build, config_h_text: []const u8) ?CMakeConfig { - .prefix = "#define ZIG_CXX_COMPILER ", - .field = "cxx_compiler", +@@ -964,14 +964,14 @@ fn parseConfigH(b: *std.Build, config_h_text: []const u8) ?CMakeConfig { + .prefix = "#define ZIG_CXX_COMPILER_ARG1 ", + .field = "cxx_compiler_arg1", }, - .{ - .prefix = "#define ZIG_LLD_INCLUDE_PATH ", @@ -49,6 +54,14 @@ - .prefix = "#define ZIG_LLD_LIBRARIES ", - .field = "lld_libraries", - }, ++ // .{ ++ // .prefix = "#define ZIG_LLD_INCLUDE_PATH ", ++ // .field = "lld_include_dir", ++ // }, ++ // .{ ++ // .prefix = "#define ZIG_LLD_LIBRARIES ", ++ // .field = "lld_libraries", ++ // }, .{ .prefix = "#define ZIG_CLANG_LIBRARIES ", .field = "clang_libraries", ++++++ zig-0.11.0.tar.xz -> zig-0.12.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/zig/zig-0.11.0.tar.xz /work/SRC/openSUSE:Factory/.zig.new.1880/zig-0.12.0.tar.xz differ: char 27, line 1
