diff options
| author | Stefan Reiff <kroko87@hotmail.com> | 2019-04-20 20:09:55 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-05-03 10:34:42 +0000 |
| commit | 165ed7fca607c6196243385a7d2cdd1c2aef68f7 (patch) | |
| tree | 76171d6e39970737490a90a7cf48c6d1f1f3c81f /main/cmocka | |
| parent | 6561814333cbc5c5b120b144d84727848c98b3d2 (diff) | |
| download | aports-165ed7fca607c6196243385a7d2cdd1c2aef68f7.tar.bz2 aports-165ed7fca607c6196243385a7d2cdd1c2aef68f7.tar.xz | |
main/cmocka: upgrade to 1.1.5
Diffstat (limited to 'main/cmocka')
| -rw-r--r-- | main/cmocka/APKBUILD | 9 | ||||
| -rw-r--r-- | main/cmocka/wordsize.patch | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/main/cmocka/APKBUILD b/main/cmocka/APKBUILD index c1eb47acec..d0257286c6 100644 --- a/main/cmocka/APKBUILD +++ b/main/cmocka/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=cmocka -pkgver=1.1.1 -pkgrel=1 +pkgver=1.1.5 +pkgrel=0 pkgdesc="An elegant unit testing framework for C with support for mock objects" url="https://cmocka.org/" arch="all" @@ -30,6 +30,7 @@ build() { cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS="$CFLAGS" \ @@ -48,6 +49,6 @@ package() { make -C "$builddir"/build DESTDIR="$pkgdir" install } -sha512sums="801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577 cmocka-1.1.1.tar.xz -16dfd8e6e2b21bda549a31cae0e60405039ff3559c879bc35811b55b06d64dcc75402d6a0cb89d029d69faeaa6484329ce03788feb9e69c1a844e63ac8d21f69 wordsize.patch +sha512sums="cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd cmocka-1.1.5.tar.xz +773b8675f38eda0ca4df919c23646f029390892dd8f8675ce67c2f736f112d243d4e03aff4f013983bbefc2657cfa6c7563416b7b6dd15dd7aa4015228bb6ad1 wordsize.patch b20b5c0d172a9df756ec093a3df4bf5bdf2a0c06a3d3ad39ec001248ccb86e6fd3dcedfc9ce42e8309cc01ea34fadffd4ebcc0fb3af9f5e795e7fe40c461ac60 musl_uintptr.patch" diff --git a/main/cmocka/wordsize.patch b/main/cmocka/wordsize.patch index bd514018ba..816dc3fda0 100644 --- a/main/cmocka/wordsize.patch +++ b/main/cmocka/wordsize.patch @@ -1,16 +1,12 @@ -musl defines __WORDSIZE in bits/reg.h so include that. Also -error out on if it's not defined, otherwise we might get wrong -assumption which causes weird failures. - ---- cmocka-1.1.1.orig/include/cmocka.h -+++ cmocka-1.1.1/include/cmocka.h -@@ -55,12 +55,9 @@ +--- cmocka-1.1.5/include/cmocka.h.orig ++++ cmocka-1.1.5/include/cmocka.h +@@ -57,12 +57,9 @@ */ /* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */ +#include <bits/reg.h> #ifndef __WORDSIZE --# if defined(__x86_64__) && !defined(__ILP32__) +-# if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__sparc_v9__) || defined(__sparcv9) -# define __WORDSIZE 64 -# else -# define __WORDSIZE 32 |