diff options
| author | grufo | 2022-03-01 10:51:13 +0000 |
|---|---|---|
| committer | grufo | 2022-03-01 10:51:13 +0000 |
| commit | d9a048fec89c3a5f876518944c79d3c0ed9a4735 (patch) | |
| tree | 8e3e7898c01a3886bc6dbbe0c01152c7581fb4c4 | |
| parent | a490b5dd1fe230593e2fa24188668d807fba46ab (diff) | |
| download | aur-d9a048fec89c3a5f876518944c79d3c0ed9a4735.tar.gz | |
Better patch
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | pthread_mutexattr_settype.patch | 28 |
3 files changed, 19 insertions, 13 deletions
@@ -14,6 +14,6 @@ pkgbase = gnunet-fuse source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-fuse-0.16.0.tar.gz source = pthread_mutexattr_settype.patch sha256sums = 2cbeb79cc2aa9939d5faaaf52c21da125029cb6646c1db0d3b9e9feea7f23fa6 - sha256sums = 56238f02eb33570d494db8888a27e561fcf78ff3558d818ff233eed36f80040d + sha256sums = d0a8e422f7228f685064d06cb54f38bbf307372f76f3623d1bd23ae119bfd3e8 pkgname = gnunet-fuse @@ -219,7 +219,7 @@ source=("$(_get_mirror _pkg_mirrors)" 'pthread_mutexattr_settype.patch') sha256sums=('2cbeb79cc2aa9939d5faaaf52c21da125029cb6646c1db0d3b9e9feea7f23fa6' - '56238f02eb33570d494db8888a27e561fcf78ff3558d818ff233eed36f80040d') + 'd0a8e422f7228f685064d06cb54f38bbf307372f76f3623d1bd23ae119bfd3e8') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/pthread_mutexattr_settype.patch b/pthread_mutexattr_settype.patch index adf74d20d9fd..f1918c6c40cb 100644 --- a/pthread_mutexattr_settype.patch +++ b/pthread_mutexattr_settype.patch @@ -1,5 +1,5 @@ diff --git a/src/fuse/mutex.c b/src/fuse/mutex.c -index beb6f93..f8c44d4 100644 +index beb6f93..f035ec8 100644 --- a/src/fuse/mutex.c +++ b/src/fuse/mutex.c @@ -35,16 +35,6 @@ @@ -19,21 +19,27 @@ index beb6f93..f8c44d4 100644 /** * @brief Structure for MUTual EXclusion (Mutex). -@@ -68,7 +58,7 @@ GNUNET_mutex_create (int isRecursive) +@@ -67,23 +57,13 @@ GNUNET_mutex_create (int isRecursive) + pthread_mutexattr_init (&attr); if (isRecursive) { - #ifdef __linux__ +-#ifdef __linux__ - GNUNET_assert (0 == pthread_mutexattr_setkind_np -+ GNUNET_assert (0 == pthread_mutexattr_settype - (&attr, PTHREAD_MUTEX_RECURSIVE_NP)); - #elif BSD || SOLARIS || OSX || WINDOWS +- (&attr, PTHREAD_MUTEX_RECURSIVE_NP)); +-#elif BSD || SOLARIS || OSX || WINDOWS GNUNET_assert (0 == pthread_mutexattr_settype -@@ -78,7 +68,7 @@ GNUNET_mutex_create (int isRecursive) + (&attr, PTHREAD_MUTEX_RECURSIVE)); +-#endif + } else { - #ifdef __linux__ +-#ifdef __linux__ - GNUNET_assert (0 == pthread_mutexattr_setkind_np -+ GNUNET_assert (0 == pthread_mutexattr_settype - (&attr, PTHREAD_MUTEX_ERRORCHECK_NP)); - #else +- (&attr, PTHREAD_MUTEX_ERRORCHECK_NP)); +-#else GNUNET_assert (0 == pthread_mutexattr_settype + (&attr, PTHREAD_MUTEX_ERRORCHECK)); +-#endif + } + mut = GNUNET_new (struct GNUNET_Mutex); + GNUNET_assert (0 == pthread_mutex_init (&mut->pt, &attr)); |