From e54db22f00c8c12f3db213e403b322448eec9908 Mon Sep 17 00:00:00 2001 From: Ron Olson Date: Tue, 14 Dec 2021 15:32:09 -0600 Subject: [PATCH] Updated to 5.5.2-RELEASE --- libdispatch.spec | 27 +++++++++++++++++---------- sources | 2 +- unusedvariable.patch | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 unusedvariable.patch diff --git a/libdispatch.spec b/libdispatch.spec index 0c58bfe..1cc8b2d 100644 --- a/libdispatch.spec +++ b/libdispatch.spec @@ -1,15 +1,17 @@ -%global debug_package %{nil} -%global reltag 5.4.2-RELEASE +%global toolchain clang +%global reltag 5.5.2-RELEASE Name: libdispatch -Version: 5.4.2 -Release: 2%{?dist} +Version: 5.5.2 +Release: 1%{?dist} Summary: Apple's Grand Central Dispatch library License: ASL 2.0 URL: https://github.com/apple/swift-corelibs-libdispatch Source0: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{reltag}.tar.gz#/corelibs-libdispatch.tar.gz +Patch0: unusedvariable.patch + BuildRequires: clang BuildRequires: libbsd-devel BuildRequires: ninja-build @@ -56,13 +58,17 @@ Development files for libdispatch %prep %setup -q -n swift-corelibs-libdispatch-swift-%{reltag} +%patch0 -p1 %build -cmake -G Ninja -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_usr} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ . -ninja +export CXX=clang++ +export CC=clang +%cmake -G Ninja . +%cmake_build + %install -ninja install +%cmake_install chrpath --delete %{buildroot}%{_libdir}/libdispatch.so @@ -80,11 +86,12 @@ chrpath --delete %{buildroot}%{_libdir}/libdispatch.so %changelog +* Tue Dec 14 2021 Ron Olson 5.5.2-1 +- Updated to 5.5.2-RELEASE +* Fri Oct 29 2021 Ron Olson 5.5.1-1 +- Updated to 5.5.1-RELEASE * Thu Jul 22 2021 Fedora Release Engineering - 1:5.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jul 07 2021 Ron Olson 5.4.2-1 -- Updated to 5.4.2-RELEASE * Tue Jun 01 2021 Ron Olson 5.4.1-1 - Updated to 5.4.1-RELEASE * Sat May 01 2021 Ron Olson 5.4-1 diff --git a/sources b/sources index af64ec9..865c6bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corelibs-libdispatch.tar.gz) = ff30fda5a51db7b9883f31d1df3bffa0d80a5626cd66d9ff7a44d682b69fcbfc386f19c217ab0e3be9f72dd2ab0bfa0ebb9a781450231a602d0256d0440dc5a6 +SHA512 (corelibs-libdispatch.tar.gz) = 7fbae1786cd544a104dd97e2ca951bd6149f15a77badb14671fad98420c823d986c21117003de163b06a51b1acfa2dafc4f4fa99b3dc607a0e8f0ccd4e87ed8b diff --git a/unusedvariable.patch b/unusedvariable.patch new file mode 100644 index 0000000..e633cd1 --- /dev/null +++ b/unusedvariable.patch @@ -0,0 +1,35 @@ +diff --color -Naur swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c +--- swift-corelibs-libdispatch-orig/src/BlocksRuntime/runtime.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/src/BlocksRuntime/runtime.c 2021-09-17 18:40:21.684025320 -0500 +@@ -479,6 +479,7 @@ + return; // stack or GC or global + } + refcount = byref->flags & BLOCK_REFCOUNT_MASK; ++ (void)refcount; + os_assert(refcount); + if (latching_decr_int_should_deallocate(&byref->flags)) { + if (byref->flags & BLOCK_BYREF_HAS_COPY_DISPOSE) { +diff --color -Naur swift-corelibs-libdispatch-orig/tests/bsdtestharness.c swift-corelibs-libdispatch/tests/bsdtestharness.c +--- swift-corelibs-libdispatch-orig/tests/bsdtestharness.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/tests/bsdtestharness.c 2021-09-17 18:39:05.679434477 -0500 +@@ -152,6 +152,7 @@ + assert(pid > 0); + + #if defined(__linux__) ++ (void)to; + int status; + struct rusage usage; + struct timeval tv_stop, tv_wall; +diff --color -Naur swift-corelibs-libdispatch-orig/tests/dispatch_apply.c swift-corelibs-libdispatch/tests/dispatch_apply.c +--- swift-corelibs-libdispatch-orig/tests/dispatch_apply.c 2020-08-14 16:49:59.000000000 -0500 ++++ swift-corelibs-libdispatch/tests/dispatch_apply.c 2021-09-17 23:38:38.107488681 -0500 +@@ -56,7 +56,8 @@ + (void)ignored; + /* prevent i and j been optimized out */ + volatile uint64_t i = 0, j = 0; +- ++ (void)i; ++ (void)j; + OSAtomicIncrement32(&busy_threads_started); + + while(!all_done)