diff --git a/community/ostree/APKBUILD b/community/ostree/APKBUILD index f70c7d73c9ec5e7b3508310a6c8edb8e496659e8..f071b687dc25bffefbc37014cf1649f172325ad5 100644 --- a/community/ostree/APKBUILD +++ b/community/ostree/APKBUILD @@ -1,14 +1,15 @@ # Contributor: André Klitzing <aklitzing@gmail.com> # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=ostree -pkgver=2019.1 +pkgver=2019.2 pkgrel=0 pkgdesc="Operating system and container binary deployment and upgrades" url="https://github.com/ostreedev/ostree" arch="all" license="LGPL-2.0-or-later" makedepends="bison glib-dev xz-dev libarchive-dev e2fsprogs-dev - libsoup-dev gpgme-dev fuse-dev linux-headers gtk-doc libxslt" + libsoup-dev gpgme-dev fuse-dev linux-headers gtk-doc libxslt + automake autoconf libtool" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/ostreedev/ostree/releases/download/v$pkgver/libostree-$pkgver.tar.xz musl-fixes.patch @@ -16,8 +17,12 @@ source="https://github.com/ostreedev/ostree/releases/download/v$pkgver/libostree options="!check" builddir="$srcdir/lib$pkgname-$pkgver" +prepare() { + default_prepare + NOCONFIGURE=1 ./autogen.sh +} + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,9 +38,8 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="71edc8175f05cc65baeb2973a951b3ac11d2557c2fd1a3faf2671057519e079b2ad49caca5d940935ad67674f192969325c898b60bd4d77035268c067d3f3c78 libostree-2019.1.tar.xz -539f5020f3380e841372f80c60c71c803ccfeffb719f1b83361b75557022c61d9cd29d9cd36929426420644def9de91fd92f5dd6923352f2ae6e1dd4b676de8c musl-fixes.patch" +sha512sums="ef009a510cc1b5e89b2be6347858151fa15d3ee7e2005d2c34fdfa3c1d6c48e5f9d171b94b1d2e40812c270c1d5710faae9aca893580b98fff8843deace486dc libostree-2019.2.tar.xz +affde3a0a1c27066c2fcc30212343274de9b3856e913adc340afa4fbfb6398732c4c39dee52837459a77273015aec4e98ea61c2b5e3e884b795462485657933c musl-fixes.patch" diff --git a/community/ostree/musl-fixes.patch b/community/ostree/musl-fixes.patch index ce4a5e6dfb6db9995efe5658b35172128de6d022..69eea3efb84401fdff1a8c5c552761adeb8c54f9 100644 --- a/community/ostree/musl-fixes.patch +++ b/community/ostree/musl-fixes.patch @@ -16,3 +16,70 @@ +#endif + + +diff --git a/libglnx/glnx-dirfd.h b/libglnx/glnx-dirfd.h +index 0046ac8..79b9f6a 100644 +--- a/libglnx/glnx-dirfd.h ++++ b/libglnx/glnx-dirfd.h +@@ -28,6 +28,16 @@ + #include <sys/stat.h> + #include <fcntl.h> + ++/* taken from glibc unistd.h and fixes musl */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + G_BEGIN_DECLS + + /** + +diff --git a/libglnx/glnx-fdio.h b/libglnx/glnx-fdio.h +index c0a7cc1..8f72920 100644 +--- a/libglnx/glnx-fdio.h ++++ b/libglnx/glnx-fdio.h +@@ -35,6 +35,17 @@ + #include <glnx-macros.h> + #include <glnx-errors.h> + ++/* taken from glibc unistd.h and fixes musl */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ ++ + G_BEGIN_DECLS + + /* Irritatingly, g_basename() which is what we want + +diff --git a/libglnx/glnx-xattrs.c b/libglnx/glnx-xattrs.c +index 79a14cd..ebb96d4 100644 +--- a/libglnx/glnx-xattrs.c ++++ b/libglnx/glnx-xattrs.c +@@ -28,6 +28,16 @@ + #include <glnx-errors.h> + #include <glnx-local-alloc.h> + ++/* taken from glibc unistd.h and fixes musl */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + static GVariant * + variant_new_ay_bytes (GBytes *bytes) + { +