diff --git a/.gitignore b/.gitignore index e5a42a1..ddbfa0e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /later_0.7.3.tar.gz /later_0.7.4.tar.gz /later_0.7.5.tar.gz +/later_0.8.0.tar.gz diff --git a/R-later.spec b/R-later.spec index d2f21cb..a285797 100644 --- a/R-later.spec +++ b/R-later.spec @@ -5,13 +5,15 @@ %global with_doc 1 Name: R-%{packname} -Version: 0.7.5 -Release: 2%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Utilities for Delaying Function Execution License: GPLv2+ URL: https://CRAN.R-project.org/package=%{packname} Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz +# Remove bundled tinycthread and use C11 threads directly. +Source1: tinycthread-threads-wrapper.h # Here's the R view of the dependencies world: # Depends: @@ -49,9 +51,10 @@ Development files for %{name}. %prep %setup -q -c -n %{packname} -# Ensure we don't accidentally use this bundled code. -rm -r %{packname}/src/tinycthread -sed -i -e '/tinycthread/d' %{packname}/MD5 +# Ensure we don't use this bundled code. +rm %{packname}/src/{badthreads.h,tinycthread.c} +cp %SOURCE1 %{packname}/src/tinycthread.h +sed -i -e '/badthread/d' -e '/tinycthread/d' %{packname}/MD5 %build @@ -94,6 +97,9 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes %changelog +* Mon Feb 11 2019 Elliott Sales de Andrade - 0.8.0-1 +- Update to latest version + * Thu Jan 31 2019 Fedora Release Engineering - 0.7.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index f37d5ef..193dbc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (later_0.7.5.tar.gz) = bc77ea45612a4889b48ebf1488bd8343fde926b4e1aedceaa6f0d5dd11bbbb9cfa5f446901b1dd2a2833d0ec55a5d6348b2d999331e5ad42f1c6076077e40c1e +SHA512 (later_0.8.0.tar.gz) = 4a5080cca1f51de5e2cd90a11946613a795acbad6d8bd694e8a658d80305f0f9a53214a4d7b4542a9d92a5389fb0249ebccecd6d84a17116f71a48f049aa99e2 diff --git a/tinycthread-threads-wrapper.h b/tinycthread-threads-wrapper.h new file mode 100644 index 0000000..63fcf23 --- /dev/null +++ b/tinycthread-threads-wrapper.h @@ -0,0 +1,57 @@ +#ifndef TINYCTHREAD_THREAD_H +#define TINYCTHREAD_THREAD_H + +#include + +/* Threads */ +#define tct_thrd_t thrd_t +#define tct_thrd_create thrd_create +#define tct_thrd_equal thrd_equal +#define tct_thrd_current thrd_current +#define tct_thrd_sleep thrd_sleep +#define tct_thrd_yield thrd_yield +#define tct_thrd_exit thrd_exit +#define tct_thrd_detach thrd_detach +#define tct_thrd_join thrd_join +#define tct_thrd_success thrd_success +#define tct_thrd_timedout thrd_timedout +#define tct_thrd_busy thrd_busy +#define tct_thrd_nomem thrd_nomem +#define tct_thrd_error thrd_error +#define tct_thrd_start_t thrd_start_t + +/* Mutual exclusion */ +#define tct_mtx_t mtx_t +#define tct_mtx_init mtx_init +#define tct_mtx_lock mtx_lock +#define tct_mtx_timedlock mtx_timedlock +#define tct_mtx_trylock mtx_trylock +#define tct_mtx_unlock mtx_unlock +#define tct_mtx_destroy mtx_destroy +#define tct_mtx_plain mtx_plain +#define tct_mtx_recursive mtx_recursive +#define tct_mtx_timed mtx_timed + +/* Call once */ +#define tct_call_once call_once + +/* Condition variables */ +#define tct_cnd_t cnd_t +#define tct_cnd_init cnd_init +#define tct_cnd_signal cnd_signal +#define tct_cnd_broadcast cnd_broadcast +#define tct_cnd_wait cnd_wait +#define tct_cnd_timedwait cnd_timedwait +#define tct_cnd_destroy cnd_destroy + +/* Thread-local storage */ +#define tct_thread_local thread_local +#define tct_tss_t tss_t +#define TCT_TSS_DTOR_ITERATIONS TSS_DTOR_ITERATIONS +#define tct_tss_dtor_t tss_dtor_t +#define tct_tss_create tss_create +#define tct_tss_get tss_get +#define tct_tss_set tss_set +#define tct_tss_delete tss_delete + +#endif /* TINYCTHREAD_THREAD_H */