diff options
Diffstat (limited to 'user/libverto')
| -rw-r--r-- | user/libverto/001-libev-not-compliant-c89.patch | 15 | ||||
| -rw-r--r-- | user/libverto/APKBUILD | 16 | ||||
| -rw-r--r-- | user/libverto/dash.patch | 131 |
3 files changed, 137 insertions, 25 deletions
diff --git a/user/libverto/001-libev-not-compliant-c89.patch b/user/libverto/001-libev-not-compliant-c89.patch deleted file mode 100644 index 502aefe98..000000000 --- a/user/libverto/001-libev-not-compliant-c89.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 09ee123..b7b5908 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - [AC_USE_SYSTEM_EXTENSIONS], - [AC_GNU_SOURCE]) - --AC_PROG_CC_C89 --for flag in -std=c89 -Wall -Wextra; do -+AC_PROG_CC_C99 -+for flag in -Wall -Wextra; do - AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],) - done - diff --git a/user/libverto/APKBUILD b/user/libverto/APKBUILD index 4e208e48d..602ed91e8 100644 --- a/user/libverto/APKBUILD +++ b/user/libverto/APKBUILD @@ -1,26 +1,24 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=libverto -pkgver=0.3.0 -pkgrel=2 +pkgver=0.3.1 +pkgrel=1 pkgdesc="Main loop abstraction library" url="https://github.com/npmccallum/libverto" arch="all" license="MIT" +depends="" makedepends="glib-dev libevent-dev libev-dev automake autoconf libtool" subpackages="$pkgname-dev $pkgname-libev $pkgname-libevent $pkgname-glib" source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz - 001-libev-not-compliant-c89.patch - " + dash.patch" prepare() { default_prepare - cd "$builddir" autoreconf -i } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -50,5 +46,5 @@ libev() { _mv_backend libev; } libevent() { _mv_backend libevent; } glib() { _mv_backend glib; } -sha512sums="1c5ff810c839a9dbd515f0782e4f742193e4e6d40a5a87e669ceb4765838d30569dc89f2b425c131247fb5f67e354abb472d08fc5e91f4e5a82c05a30d2daac8 libverto-0.3.0.tar.gz -db713bb388766a3bd4cf7fca579fdd1611f30d53054d246d42c2b106932a3c758347d84ff5138b1135c599437f520dc46d20048bb27e6d305e270fca7ac3a53b 001-libev-not-compliant-c89.patch" +sha512sums="8b46a5c410be210e52b92dccfe6e677026b26fd6cab1ee7a97d7eab4d4951913bde8768a77942189a0188ee336d5dcca2a985e9edc3a8c7529f164a7e5077bd8 libverto-0.3.1.tar.gz +414242414a71c36744be07e034a75d3c95d7d41682eb8431115b25e2b09040939ee3aaaaee8c9ba303d4f5ab21ae39de2843b6e137659deba2bc0befda208a8f dash.patch" diff --git a/user/libverto/dash.patch b/user/libverto/dash.patch new file mode 100644 index 000000000..f506c5dba --- /dev/null +++ b/user/libverto/dash.patch @@ -0,0 +1,131 @@ +--- libverto-0.3.1/configure.ac ++++ libverto-0.3.1/configure.ac +@@ -91,22 +91,22 @@ AC_ARG_WITH([tevent], + + # Ensure that if a builtin is chosen only one is built + BUILTIN_MODULE= +-if test x$WITH_GLIB == xbuiltin; then ++if test x$WITH_GLIB = xbuiltin; then + BUILTIN_MODULE=glib + WITH_LIBEV=no + WITH_LIBEVENT=no + WITH_TEVENT=no +-elif test x$WITH_LIBEV == xbuiltin; then ++elif test x$WITH_LIBEV = xbuiltin; then + BUILTIN_MODULE=libev + WITH_LIBGLIB=no + WITH_LIBEVENT=no + WITH_TEVENT=no +-elif test x$WITH_LIBEVENT == xbuiltin; then ++elif test x$WITH_LIBEVENT = xbuiltin; then + BUILTIN_MODULE=libevent + WITH_LIBGLIB=no + WITH_LIBEV=no + WITH_TEVENT=no +-elif test x$WITH_TEVENT == xbuiltin; then ++elif test x$WITH_TEVENT = xbuiltin; then + BUILTIN_MODULE=tevent + WITH_GLIB=no + WITH_LIBEV=no +@@ -118,29 +118,29 @@ if test x$BUILTIN_MODULE != x; then + fi + + # Ensure that there is only one default (convert duplicate default to yes) +-if test x$WITH_GLIB == xdefault; then ++if test x$WITH_GLIB = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [glib]) +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_LIBEV == xdefault; then ++if test x$WITH_LIBEV = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [libev]) +- test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_LIBEVENT == xdefault; then ++if test x$WITH_LIBEVENT = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [libevent]) +- test x$WITH_GLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes ++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes + fi +-if test x$WITH_TEVENT == xdefault; then ++if test x$WITH_TEVENT = xdefault; then + AC_DEFINE([DEFUALT_MODULE], [tevent]) +- test x$WITH_GLIB == xdefault && WITH_GLIB=yes +- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes +- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes ++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes ++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes ++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes + fi + + BUILD_GLIB=no +@@ -151,7 +151,7 @@ BUILD_TEVENT=no + if test x$WITH_GLIB != xno; then + PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB], + [test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")]) +- if test x$BUILD_GLIB == xauto; then ++ if test x$BUILD_GLIB = xauto; then + BUILD_GLIB=yes + fi + fi +@@ -165,7 +165,7 @@ if test x$WITH_LIBEV != xno; then + ), + [test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")] + ) +- if test x$BUILD_LIBEV == xauto; then ++ if test x$BUILD_LIBEV = xauto; then + BUILD_LIBEV=yes + fi + fi +@@ -173,7 +173,7 @@ fi + if test x$WITH_LIBEVENT != xno; then + PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT], + [test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")]) +- if test x$BUILD_LIBEVENT == xauto; then ++ if test x$BUILD_LIBEVENT = xauto; then + BUILD_LIBEVENT=yes + fi + fi +@@ -181,19 +181,19 @@ fi + if test x$WITH_TEVENT != xno; then + PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT], + [test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")]) +- if test x$BUILD_TEVENT == xauto; then ++ if test x$BUILD_TEVENT = xauto; then + BUILD_TEVENT=yes + fi + fi + +-AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno]) +-AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno]) +-AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno]) +-AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_TEVENT != xno]) +-AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib]) +-AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev]) +-AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent]) +-AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE == xtevent]) ++AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno]) ++AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno]) ++AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno]) ++AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_TEVENT != xno]) ++AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib]) ++AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev]) ++AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent]) ++AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE = xtevent]) + + AC_MSG_NOTICE() + AC_MSG_NOTICE([BUILD CONFIGURATION]) |