diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-02-10 22:44:36 -0600 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-02-16 17:34:16 +0000 |
| commit | dc2d9b555c56628fb0ed8359cc924e39717d66d3 (patch) | |
| tree | 210257b5e006e8b520f0916c40ac6e91faf5aacf /main | |
| parent | 22a1f51608761554eaf6d57583ae83d64464bfe6 (diff) | |
| download | aports-dc2d9b555c56628fb0ed8359cc924e39717d66d3.tar.bz2 aports-dc2d9b555c56628fb0ed8359cc924e39717d66d3.tar.xz | |
main/libmowgli: bump to 2.1.3, mark no tests, modernise
Diffstat (limited to 'main')
| -rw-r--r-- | main/libmowgli/APKBUILD | 30 | ||||
| -rw-r--r-- | main/libmowgli/cacheline.patch | 25 |
2 files changed, 40 insertions, 15 deletions
diff --git a/main/libmowgli/APKBUILD b/main/libmowgli/APKBUILD index fa455b9799..703e38ed5a 100644 --- a/main/libmowgli/APKBUILD +++ b/main/libmowgli/APKBUILD @@ -1,46 +1,46 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libmowgli -pkgver=2.0.0 +pkgver=2.1.3 pkgrel=0 -pkgdesc="mowgli is a framework designed to reduce writing of boilerplate code" +pkgdesc="C library framework designed to reduce writing of boilerplate code" url="http://atheme.org/project/mowgli" arch="all" +options="!check" # No test suite. license="ISC" depends= -makedepends= +makedepends="openssl-dev" install= subpackages="$pkgname-dev" -source="https://github.com/atheme/libmowgli-2/archive/libmowgli-$pkgver.tar.gz" +source="https://github.com/atheme/libmowgli-2/archive/libmowgli-$pkgver.tar.gz + cacheline.patch" -_builddir="$srcdir"/libmowgli-2-$pkgname-$pkgver +builddir="$srcdir"/libmowgli-2-$pkgname-$pkgver prepare() { - cd "$_builddir" - update_config_sub || return 1 + cd "$builddir" + default_prepare # workaround bug in busybox sed -e "/touch/s/0001010000/200001010000/g" \ -i configure } build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - || return 1 - make || return 1 + --infodir=/usr/share/info + make } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install } -md5sums="0b8cf8b66d745d40f186e3cbd22fdc0e libmowgli-2.0.0.tar.gz" -sha256sums="fd48e74f1f706b436e0f25c3d3d63753e9c066ef88e662cd34303ccd3b780798 libmowgli-2.0.0.tar.gz" -sha512sums="220254c6083fcce5a7cf4dfc0684a15db61aafc371570f74af8be6fb8e4562945dc241bb79539eafd440150573f39153156fb912628f9bc11854ecefdafe3f95 libmowgli-2.0.0.tar.gz" +sha512sums="bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533 libmowgli-2.1.3.tar.gz +861f043ef931b6d256c76c45a7958e3fdaf4db2d50ec09c2881a3d9f73c14666693cb11fc5a1ebbe1957efdaed970af86b7b61f2a02302d7f67d0f6c3e4f2bee cacheline.patch" diff --git a/main/libmowgli/cacheline.patch b/main/libmowgli/cacheline.patch new file mode 100644 index 0000000000..0a5c3374ee --- /dev/null +++ b/main/libmowgli/cacheline.patch @@ -0,0 +1,25 @@ +From 2b8892fe2ca51ef0334b08babad0fa9d689087c0 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Wed, 27 Sep 2017 01:42:33 -0500 +Subject: [PATCH] cacheline: Ensure sysconf var is defined before use on Linux + +--- + src/libmowgli/platform/cacheline.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libmowgli/platform/cacheline.c b/src/libmowgli/platform/cacheline.c +index 90c803f..7651588 100644 +--- a/src/libmowgli/platform/cacheline.c ++++ b/src/libmowgli/platform/cacheline.c +@@ -32,7 +32,7 @@ size_t cacheline_size; + void + mowgli_cacheline_bootstrap(void) + { +-#ifdef MOWGLI_OS_LINUX ++#if defined(MOWGLI_OS_LINUX) && defined(_SC_LEVEL1_DCACHE_LINESIZE) + cacheline_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); + #elif defined(MOWGLI_OS_OSX) + size_t size = sizeof(size_t); +-- +2.10.0 + |